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

Trivial merge