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

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

28f5c83ca794c7965023237d0a3638f3a150c1e4