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

Merge branch 'master' into crem
---

dd7c0335b06946074a32330cc98d3c338dc201be