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

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

00483b344e32b78e7998c5f6220945a164d5c887