From: Guillaume Pellerin Date: Tue, 30 Sep 2014 21:33: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=05201c29e318da1d3119c1519b6a7ce9fd57d481;p=timeside-diadems.git Merge branch 'dev' of github.com:yomguy/TimeSide into dev --- 05201c29e318da1d3119c1519b6a7ce9fd57d481