]> git.parisson.com Git - timeside-diadems.git/commitdiff
Merge branch 'dev' of github.com:yomguy/TimeSide into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 30 Sep 2014 21:33:38 +0000 (23:33 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 30 Sep 2014 21:33:38 +0000 (23:33 +0200)

Trivial merge