]> git.parisson.com Git - timeside-diadems.git/commitdiff
Merge branch 'dev' of github.com:yomguy/TimeSide into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 6 Oct 2014 14:54:33 +0000 (16:54 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 6 Oct 2014 14:54:33 +0000 (16:54 +0200)

Trivial merge