]> git.parisson.com Git - telemeta-doc.git/commitdiff
Merge branch 'master' of github.com:Parisson/Telemeta-doc
authorThomas Fillon <thomas@parisson.com>
Thu, 9 Oct 2014 09:39:40 +0000 (11:39 +0200)
committerThomas Fillon <thomas@parisson.com>
Thu, 9 Oct 2014 09:39:40 +0000 (11:39 +0200)

Trivial merge