From: Guillaume Pellerin <yomguy@parisson.com>
Date: Sat, 22 Mar 2014 19:55:50 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=720cf26bd68f4c2a49d9e7d5057a5d40b04af655;p=timeside-diadems.git

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

720cf26bd68f4c2a49d9e7d5057a5d40b04af655