]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of https://github.com/maths28/Telemeta into dev
authormathieu <mathieu.boye28@gmail.com>
Tue, 26 Apr 2016 13:05:34 +0000 (15:05 +0200)
committermathieu <mathieu.boye28@gmail.com>
Tue, 26 Apr 2016 13:05:34 +0000 (15:05 +0200)
Former-commit-id: b4f83798aaff98f5838ab87a1784c74a39d5c967


Trivial merge