]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 9 Apr 2015 15:38:01 +0000 (17:38 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 9 Apr 2015 15:38:01 +0000 (17:38 +0200)

Trivial merge