From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 20 Nov 2014 21:35:34 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:Parisson/TimeSide into dev
X-Git-Tag: 0.7^2~48
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=82dad0268fc0ba8c6d6f62f75492745e719b3b65;p=timeside.git

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

82dad0268fc0ba8c6d6f62f75492745e719b3b65