]> git.parisson.com Git - telemeta.git/commitdiff
Merge remote-tracking branch 'origin/devinstable' into dev
authormathieu <mathieu.boye28@gmail.com>
Tue, 17 May 2016 13:23:44 +0000 (15:23 +0200)
committermathieu <mathieu.boye28@gmail.com>
Tue, 17 May 2016 13:23:44 +0000 (15:23 +0200)

Trivial merge