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

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

41de77a8704c71cd04fbc9c3d2ed46d3935b35d4