From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 31 Jan 2014 08:41:17 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.3~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=124678b85966552bcc0f6aa8380cf441fba0083e;p=timeside.git

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

124678b85966552bcc0f6aa8380cf441fba0083e