From: yomguy <yomguy@parisson.com>
Date: Tue, 18 Dec 2012 10:02:15 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c23030fcf4994592b1087b20e88284a4b5c24428;p=telemeta-pages.git

Merge branch 'master' into crem
---

c23030fcf4994592b1087b20e88284a4b5c24428