]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 3 Jul 2014 14:40:00 +0000 (16:40 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 3 Jul 2014 14:40:00 +0000 (16:40 +0200)

Trivial merge