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

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

c03b88e8b5bfe804d500157db20126663eb4bd0c