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