]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' of https://github.com/yomguy/Telemeta into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 23 Oct 2015 10:56:09 +0000 (12:56 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 23 Oct 2015 10:56:09 +0000 (12:56 +0200)

Trivial merge