From: Guillaume Pellerin Date: Wed, 22 Oct 2014 16:06:34 +0000 (+0200) Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev X-Git-Tag: 0.6~4^2 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4a9e6e43b97913fbdc1fbc38ff72b4618b8be45e;p=timeside.git Merge branch 'dev' of github.com:yomguy/TimeSide into dev --- 4a9e6e43b97913fbdc1fbc38ff72b4618b8be45e