From: Guillaume Pellerin Date: Tue, 8 Oct 2013 11:49:17 +0000 (+0200) Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f79bd34d4a36124c04e084a2722b5017b220e921;p=timeside-diadems.git Merge branch 'dev' of github.com:yomguy/TimeSide into dev --- f79bd34d4a36124c04e084a2722b5017b220e921