From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 15 Feb 2018 14:42:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c4625127569338c1c186bdc7871f4e110f9d6464;p=telemeta.git

Merge remote-tracking branch 'origin/master' into crem
---

c4625127569338c1c186bdc7871f4e110f9d6464