From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 20 Jan 2014 15:09:31 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.3~18
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=98ba6a27cf26f2e63d85d5b2abc7fc1e1c05b11d;p=timeside.git

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

98ba6a27cf26f2e63d85d5b2abc7fc1e1c05b11d