]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'dev' of github.com:yomguy/TimeSide into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 4 Feb 2014 08:53:45 +0000 (09:53 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 4 Feb 2014 08:53:45 +0000 (09:53 +0100)

Trivial merge