]> git.parisson.com Git - telemeta-doc.git/commitdiff
Merge branch 'dev' of github.com:Parisson/Telemeta-doc into dev
authorThomas Fillon <thomas@parisson.com>
Sun, 25 Jan 2015 21:29:08 +0000 (22:29 +0100)
committerThomas Fillon <thomas@parisson.com>
Sun, 25 Jan 2015 21:29:08 +0000 (22:29 +0100)

Trivial merge