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

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

c0a401d2b17f11f177773397d1655620b9a50a74