]> git.parisson.com Git - telemeta-doc.git/commitdiff
Merge Dev from github
authorThomas Fillon <thomas@parisson.com>
Sun, 15 Jun 2014 19:04:27 +0000 (21:04 +0200)
committerThomas Fillon <thomas@parisson.com>
Sun, 15 Jun 2014 19:04:27 +0000 (21:04 +0200)

Trivial merge