From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 11 Feb 2014 22:04:37 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Tag: 0.5.4~7
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1d012c7d5b1e70d12927fa2150dd7ae3b9c708be;p=timeside.git

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

1d012c7d5b1e70d12927fa2150dd7ae3b9c708be