From: Thomas Fillon <thomas@parisson.com>
Date: Sun, 1 Dec 2013 19:53:34 +0000 (+0100)
Subject: Merge branch 'dev' of https://github.com/yomguy/TimeSide into dev
X-Git-Tag: 0.5.2~25
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c8330c34a727308a450d083912f77f6e6f8cb778;p=timeside.git

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

c8330c34a727308a450d083912f77f6e6f8cb778