From: Guillaume Pellerin Date: Mon, 6 Oct 2014 14:54:33 +0000 (+0200) Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=791e08aef36a271b31f2062e623caf47da66063a;p=timeside-diadems.git Merge branch 'dev' of github.com:yomguy/TimeSide into dev --- 791e08aef36a271b31f2062e623caf47da66063a