From: Guillaume Pellerin Date: Fri, 31 Jan 2014 08:41:17 +0000 (+0100) Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6349c86d9bda9ecc4a1146aec2cc17df54c90bf8;p=timeside-diadems.git Merge branch 'dev' of github.com:yomguy/TimeSide into dev --- 6349c86d9bda9ecc4a1146aec2cc17df54c90bf8