]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'dev' of github.com:parisson/TimeSide into dev
authorThomas Fillon <thomas@parisson.com>
Fri, 28 Nov 2014 17:15:57 +0000 (18:15 +0100)
committerThomas Fillon <thomas@parisson.com>
Fri, 28 Nov 2014 17:15:57 +0000 (18:15 +0100)

Trivial merge