From: Guillaume Pellerin <yomguy@parisson.com>
Date: Sun, 18 May 2014 22:14:20 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a7e1132aac073b317eda4e1181c87e1155e7711b;p=timeside-diadems.git

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

a7e1132aac073b317eda4e1181c87e1155e7711b