]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 20 May 2014 09:26:59 +0000 (11:26 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 20 May 2014 09:26:59 +0000 (11:26 +0200)

Trivial merge