]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'dev' of github.com:yomguy/TimeSide into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 20 Jan 2014 15:09:31 +0000 (16:09 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 20 Jan 2014 15:09:31 +0000 (16:09 +0100)

Trivial merge