From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 10 Jun 2016 15:33:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d6e2b8d1504c1e7ebf1ffda64007b1ca5515682c;p=telemeta.git

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

d6e2b8d1504c1e7ebf1ffda64007b1ca5515682c