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

Merge branch 'master' into crem
---

921a6217b0c138cf0545733c5ac18b9d1543d993