]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 14 May 2014 22:32:38 +0000 (00:32 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 14 May 2014 22:32:38 +0000 (00:32 +0200)

Trivial merge