]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'dev' of github.com:Parisson/TimeSide into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 19 Jan 2015 01:34:19 +0000 (02:34 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 19 Jan 2015 01:34:19 +0000 (02:34 +0100)

Trivial merge