From: Guillaume Pellerin Date: Fri, 24 Oct 2014 17:18:04 +0000 (+0200) Subject: Merge branch 'dev' of github.com:yomguy/TimeSide into dev X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=23855f35767a7751e534500ba0b21c8765d139a4;p=timeside-diadems.git Merge branch 'dev' of github.com:yomguy/TimeSide into dev --- 23855f35767a7751e534500ba0b21c8765d139a4