From: Thomas Fillon <thomas@parisson.com>
Date: Thu, 12 Dec 2013 14:42:19 +0000 (+0100)
Subject: Merge branch 'dev' of https://github.com/yomguy/TimeSide into dev
X-Git-Tag: 0.5.2~8
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=64bdbeb39d94ee3602b42a721aeb9fc019465b0a;p=timeside.git

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

64bdbeb39d94ee3602b42a721aeb9fc019465b0a