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

Merge branch 'master' into crem
---

d27ff8bc59580ab2cba1cf8416e63e532c50398e