]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'dev' of github.com:Parisson/TimeSide into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 20 Nov 2014 21:35:34 +0000 (22:35 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 20 Nov 2014 21:35:34 +0000 (22:35 +0100)

Trivial merge