From: Thomas Fillon <thomas@parisson.com>
Date: Tue, 26 Nov 2013 22:21:42 +0000 (+0100)
Subject: Merge branch 'dev' of https://github.com/yomguy/TimeSide into dev
X-Git-Tag: 0.5.2~41
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=02b5d93bf037d426c3089ad7fbded2fb188074c2;p=timeside.git

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

02b5d93bf037d426c3089ad7fbded2fb188074c2