From: Guillaume Pellerin Date: Thu, 15 May 2014 10:17:02 +0000 (+0200) Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=533fe041f902927ec0b4de023be64424e4721f82;p=timeside-diadems.git Merge branch 'dev' of github.com:yomguy/TimeSide into dev --- 533fe041f902927ec0b4de023be64424e4721f82