]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'dev' of github.com:yomguy/TimeSide into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 21 Apr 2014 21:09:53 +0000 (23:09 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 21 Apr 2014 21:09:53 +0000 (23:09 +0200)

Trivial merge