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

Trivial merge