]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'dev' of github.com:yomguy/TimeSide into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 15 Oct 2013 20:44:12 +0000 (22:44 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 15 Oct 2013 20:44:12 +0000 (22:44 +0200)

Trivial merge