]> git.parisson.com Git - telemeta-doc.git/commitdiff
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 8 Jul 2014 07:39:11 +0000 (09:39 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 8 Jul 2014 07:39:11 +0000 (09:39 +0200)

Trivial merge