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

Merge branch 'master' into crem
---

c7f9f0346a5cba937b24a50ac7767ed8c24f249d