]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'dev' of github.com:yomguy/TimeSide into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 2 Jul 2014 23:05:33 +0000 (01:05 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 2 Jul 2014 23:05:33 +0000 (01:05 +0200)

Trivial merge