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

Merge branch 'master' into crem
---

41c28179561b2c7f68f2204ff612ab13fe7583bd