]> git.parisson.com Git - telemeta-doc.git/commitdiff
Merge branch 'dev' of github.com:Parisson/Telemeta-doc into dev
authorThomas Fillon <thomas@parisson.com>
Mon, 7 Jul 2014 19:24:50 +0000 (21:24 +0200)
committerThomas Fillon <thomas@parisson.com>
Mon, 7 Jul 2014 19:24:50 +0000 (21:24 +0200)

Trivial merge