From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 25 Apr 2016 18:49:40 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into demo
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4b635ec77a406f095328434db9ad288e0dbb9e81;p=telemeta.git

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

Conflicts:
	telemeta/pages
---

4b635ec77a406f095328434db9ad288e0dbb9e81