From: yomguy <yomguy@parisson.com>
Date: Thu, 10 Nov 2011 13:02:18 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.3.9~3^2~1^2~41
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2debf26cb59c954453ea007e5ce55b77fc12ebba;p=telemeta.git

Merge branch 'master' into crem
---

2debf26cb59c954453ea007e5ce55b77fc12ebba