]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'dev' of github.com:yomguy/TimeSide into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 3 Feb 2014 14:24:46 +0000 (15:24 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 3 Feb 2014 14:24:46 +0000 (15:24 +0100)

Trivial merge