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