]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'dev' of https://github.com/yomguy/TimeSide into dev before push IRIT...
authorThomas Fillon <thomas@parisson.com>
Tue, 15 Oct 2013 21:42:50 +0000 (23:42 +0200)
committerThomas Fillon <thomas@parisson.com>
Tue, 15 Oct 2013 21:42:50 +0000 (23:42 +0200)

Trivial merge