]> git.parisson.com Git - timeside-diadems.git/commitdiff
Merge branch 'dev' of github.com:yomguy/TimeSide into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 14 May 2014 15:20:59 +0000 (17:20 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 14 May 2014 15:20:59 +0000 (17:20 +0200)

Trivial merge