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

Trivial merge