From: yomguy <yomguy@parisson.com>
Date: Mon, 31 Oct 2011 13:31:49 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.3.9~3^2~1^2~43
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=35abbfef64fd3eba43fa0fb2fd394a05b2ee964a;p=telemeta.git

Merge branch 'master' into crem
---

35abbfef64fd3eba43fa0fb2fd394a05b2ee964a