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

Merge branch 'master' into crem
---

43191a6c9f6db3d0d9ffebf2b0d6906f97e34ef8