]> git.parisson.com Git - telemeta.git/commitdiff
Merge remote-tracking branch 'origin/master' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 19 Feb 2018 23:33:20 +0000 (00:33 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 19 Feb 2018 23:33:20 +0000 (00:33 +0100)

Trivial merge