From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 19 Jan 2015 01:34:19 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:Parisson/TimeSide into dev
X-Git-Tag: 0.7^2~18
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=431f740a1851bdd4b34bbc71e611916252b3de83;p=timeside.git

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

431f740a1851bdd4b34bbc71e611916252b3de83