]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of https://github.com/yomguy/Telemeta into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 5 Nov 2015 16:34:07 +0000 (17:34 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 5 Nov 2015 16:34:07 +0000 (17:34 +0100)

Trivial merge