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

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

17cfb9fa56188159f975cca2ff6dffa80df215b5