From: Thomas Fillon <thomas@parisson.com>
Date: Fri, 13 Dec 2013 19:55:45 +0000 (+0100)
Subject: Merge branch 'dev' of https://github.com/yomguy/TimeSide into dev
X-Git-Tag: 0.5.2~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9920039ede2c334df15b7df49e38c9f0d74d4bf2;p=timeside.git

Merge branch 'dev' of https://github.com/yomguy/TimeSide into dev
---

9920039ede2c334df15b7df49e38c9f0d74d4bf2