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

Trivial merge