From: Guillaume Pellerin Date: Mon, 7 Jul 2014 22:25:34 +0000 (+0200) Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a1cb5dba3e02beab86c40c798a0d1c88142a9e2f;p=timeside-diadems.git Merge branch 'dev' of github.com:yomguy/TimeSide into dev --- a1cb5dba3e02beab86c40c798a0d1c88142a9e2f