]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'master' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 16 Dec 2013 16:53:28 +0000 (17:53 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 16 Dec 2013 16:53:28 +0000 (17:53 +0100)

Trivial merge