From: Thomas Fillon <thomas@parisson.com>
Date: Fri, 5 Jul 2013 22:52:42 +0000 (+0200)
Subject: Merge branch 'dev' of https://github.com/yomguy/TimeSide into dev
X-Git-Tag: 0.5.0~71^2~10
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=553e64ec99cc25967cb02e7d7862604e0d0e6c3d;p=timeside.git

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

553e64ec99cc25967cb02e7d7862604e0d0e6c3d