From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 7 Jul 2014 22:25:34 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.6~4^2~55^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=20b188b4315216c2a2398b1ac67216b6efa40968;p=timeside.git

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

20b188b4315216c2a2398b1ac67216b6efa40968