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

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

7463f019c1c267f966869317731cbf1873472b03