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

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

20386bc870fdb5f2a8fcad9b2cd05c865d41828f