From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 30 Sep 2014 21:33:38 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.6~4^2~33^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6796b0b2501854eb34c765e86bf665f5529bf853;p=timeside.git

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

6796b0b2501854eb34c765e86bf665f5529bf853