]> git.parisson.com Git - telemeta.git/commitdiff
Merge remote-tracking branch 'origin/master' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 20 Jun 2018 10:28:47 +0000 (12:28 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 20 Jun 2018 10:28:47 +0000 (12:28 +0200)

Trivial merge