]> git.parisson.com Git - telemeta.git/commitdiff
Merge Parisson/Telemeta/dev
authormathieu <mathieu.boye28@gmail.com>
Thu, 28 Apr 2016 13:24:26 +0000 (15:24 +0200)
committermathieu <mathieu.boye28@gmail.com>
Thu, 28 Apr 2016 13:24:26 +0000 (15:24 +0200)

Trivial merge