]> git.parisson.com Git - telemeta-doc.git/commitdiff
FMA_2015 : merge commits
authorThomas Fillon <thomas@parisson.com>
Fri, 12 Jun 2015 00:17:36 +0000 (02:17 +0200)
committerThomas Fillon <thomas@parisson.com>
Fri, 12 Jun 2015 00:17:36 +0000 (02:17 +0200)

Trivial merge