From: yomguy <yomguy@parisson.com>
Date: Mon, 14 Nov 2011 14:19:56 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.3.9~3^2~1^2~37
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=66771a3c47ac7f91b0129eb809b65549b68e30c1;p=telemeta.git

Merge branch 'master' into crem
---

66771a3c47ac7f91b0129eb809b65549b68e30c1