]> git.parisson.com Git - telemeta-doc.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 24 Sep 2014 08:18:10 +0000 (10:18 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 24 Sep 2014 08:18:10 +0000 (10:18 +0200)

Trivial merge