From: yomguy <yomguy@parisson.com>
Date: Thu, 27 Oct 2011 13:52:17 +0000 (+0200)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.3.9~3^2~1^2~56
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=07ec2d773053478f9fea1758cc913e8c1ccf7c51;p=telemeta.git

Merge branch 'master' into crem
---

07ec2d773053478f9fea1758cc913e8c1ccf7c51