]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of https://github.com/maths28/Telemeta into dev
authormathieu <mathieu.boye28@gmail.com>
Wed, 11 May 2016 09:12:24 +0000 (11:12 +0200)
committermathieu <mathieu.boye28@gmail.com>
Wed, 11 May 2016 09:12:24 +0000 (11:12 +0200)

Trivial merge