From: Guillaume Pellerin <yomguy@parisson.com>
Date: Sun, 19 Jan 2014 18:10:11 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.3~22
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3d0d230fff565fcdc75cbc6e8c120936bdc2a280;p=timeside.git

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

3d0d230fff565fcdc75cbc6e8c120936bdc2a280