]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' of github.com:yomguy/Telemeta
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 7 Feb 2014 08:22:32 +0000 (09:22 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 7 Feb 2014 08:22:32 +0000 (09:22 +0100)

Trivial merge