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

Merge branch 'master' into crem
---

a342911c655d80442e5cfb5ff69cbc108d386b47