From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 3 Feb 2014 14:24:46 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.3~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a1bedf7f06fe37b221e7dad4c495ef99d5a13536;p=timeside.git

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

a1bedf7f06fe37b221e7dad4c495ef99d5a13536