From: Guillaume Pellerin <yomguy@parisson.com>
Date: Sun, 18 May 2014 22:14:20 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.5~1^2~17^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bc14a4accba42651be6d9eeddae7ddc9aeff9166;p=timeside.git

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

bc14a4accba42651be6d9eeddae7ddc9aeff9166