]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'dev' of github.com:yomguy/TimeSide into dev 0.5.0
authorPaul Brossier <piem@piem.org>
Wed, 16 Oct 2013 09:08:28 +0000 (11:08 +0200)
committerPaul Brossier <piem@piem.org>
Wed, 16 Oct 2013 09:08:28 +0000 (11:08 +0200)

Trivial merge