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

Merge branch 'master' into crem
---

4b06674f79e7abc7f6a33e04aeed73363c8d0e05