]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
authorThomas Fillon <thomas@parisson.com>
Wed, 30 Mar 2016 07:00:22 +0000 (09:00 +0200)
committerThomas Fillon <thomas@parisson.com>
Wed, 30 Mar 2016 07:00:22 +0000 (09:00 +0200)

Trivial merge