]> git.parisson.com Git - telemeta-doc.git/commitdiff
Merge branch 'master' of vcs.parisson.com:/var/git/telemeta-doc
authorThomas Fillon <thomas@parisson.com>
Thu, 13 Mar 2014 12:41:48 +0000 (13:41 +0100)
committerThomas Fillon <thomas@parisson.com>
Thu, 13 Mar 2014 12:41:48 +0000 (13:41 +0100)

Trivial merge