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

Trivial merge