From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 21 Apr 2014 21:09:53 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.5~1^2~26^2~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ccae871ac896495fee4033887f052cb378861f40;p=timeside.git

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

ccae871ac896495fee4033887f052cb378861f40