]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 28 May 2014 13:07:02 +0000 (15:07 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 28 May 2014 13:07:02 +0000 (15:07 +0200)

Trivial merge