From: Guillaume Pellerin Date: Wed, 14 May 2014 15:11:38 +0000 (+0200) Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e79ce9e748fc60b5b0377d257b34462e1546a877;p=timeside-diadems.git Merge branch 'dev' of github.com:yomguy/TimeSide into dev --- e79ce9e748fc60b5b0377d257b34462e1546a877