]> git.parisson.com Git - telemeta-doc.git/commitdiff
Merge branch 'dev' of github.com:Parisson/Telemeta-doc into dev
authorThomas Fillon <thomas@parisson.com>
Tue, 10 Jun 2014 09:41:50 +0000 (11:41 +0200)
committerThomas Fillon <thomas@parisson.com>
Tue, 10 Jun 2014 09:41:50 +0000 (11:41 +0200)

Trivial merge