From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 14 May 2014 15:11:38 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.5~1^2~26^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5598375a25605d1e73dbfdc4fabe077816eab929;p=timeside.git

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

5598375a25605d1e73dbfdc4fabe077816eab929