]> git.parisson.com Git - telemeta.git/commitdiff
Merge remote-tracking branch 'origin/devinstable' into dev
authormathieu <mathieu.boye28@gmail.com>
Thu, 19 May 2016 12:01:11 +0000 (14:01 +0200)
committermathieu <mathieu.boye28@gmail.com>
Thu, 19 May 2016 12:01:11 +0000 (14:01 +0200)

Trivial merge