From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 28 Nov 2014 14:17:48 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:Parisson/TimeSide into dev
X-Git-Tag: 0.7^2~43^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=59e42a9d95c471ccf0742ec9ccf9dacf0870b03a;p=timeside.git

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

59e42a9d95c471ccf0742ec9ccf9dacf0870b03a