]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'dev' of github.com:yomguy/TimeSide into dev
authorThomas Fillon <thomas@parisson.com>
Wed, 22 Oct 2014 15:31:27 +0000 (17:31 +0200)
committerThomas Fillon <thomas@parisson.com>
Wed, 22 Oct 2014 15:31:27 +0000 (17:31 +0200)

Trivial merge