]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 24 Oct 2014 17:20:57 +0000 (19:20 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 24 Oct 2014 17:20:57 +0000 (19:20 +0200)

Trivial merge