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

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

fad7daf310c5f21fbce813f793c4830e3aaef7b4