]> git.parisson.com Git - telemeta-doc.git/commitdiff
merge github/master into local master (Thomas)
authorThomas Fillon <thomas@parisson.com>
Thu, 9 Oct 2014 09:14:43 +0000 (11:14 +0200)
committerThomas Fillon <thomas@parisson.com>
Thu, 9 Oct 2014 09:14:43 +0000 (11:14 +0200)

Trivial merge