]> git.parisson.com Git - telemeta.git/commitdiff
Merge remote-tracking branch 'origin/release/1.6.4' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 7 Jun 2017 13:49:02 +0000 (15:49 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 7 Jun 2017 13:49:02 +0000 (15:49 +0200)

Trivial merge