]> git.parisson.com Git - telemeta.git/commitdiff
Merge remote-tracking branch 'origin' into demo
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 10 Jun 2016 12:44:58 +0000 (14:44 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 10 Jun 2016 12:44:58 +0000 (14:44 +0200)

Trivial merge