From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 4 Feb 2014 08:53:45 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.4~15
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a1665b4526d02abd2982fe949859f4991d0a2dc5;p=timeside.git

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

a1665b4526d02abd2982fe949859f4991d0a2dc5