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-Url: https://git.parisson.com/?a=commitdiff_plain;h=92a307fc6280f98a093f996924c5f8e5f0845f51;p=timeside-diadems.git

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

92a307fc6280f98a093f996924c5f8e5f0845f51