From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 2 Jul 2014 23:05:33 +0000 (+0200)
Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0a0bd6aa971b1f7e1c9b95cab81706f2a1b1b973;p=timeside-diadems.git

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

0a0bd6aa971b1f7e1c9b95cab81706f2a1b1b973