From: Thomas Fillon <thomas@parisson.com>
Date: Tue, 22 Apr 2014 06:18:58 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.5~1^2~38^2~22
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ef76e0bbcdeb647516a3e144598d682a8c4bcc5b;p=timeside.git

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

ef76e0bbcdeb647516a3e144598d682a8c4bcc5b