]> git.parisson.com Git - telemeta.git/commitdiff
Merge remote-tracking branch 'origin/devinstable' into dev
authormathieu <mathieu.boye28@gmail.com>
Thu, 28 Apr 2016 13:05:36 +0000 (15:05 +0200)
committermathieu <mathieu.boye28@gmail.com>
Thu, 28 Apr 2016 13:05:36 +0000 (15:05 +0200)

Trivial merge