]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 23 Oct 2014 08:32:53 +0000 (10:32 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 23 Oct 2014 08:32:53 +0000 (10:32 +0200)

Trivial merge