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

Merge branch 'master' into crem
---

d9eed0afec778ba1eef12b706f1095a80c2ac026