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

Merge branch 'master' into crem
---

ca090165daa026f1f1e6293ed3f177d846aa50f4