]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'dev' of github.com:yomguy/TimeSide into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 10 Oct 2013 16:49:48 +0000 (18:49 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 10 Oct 2013 16:50:21 +0000 (18:50 +0200)

Trivial merge