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

Merge branch 'master' into crem
---

f10259c5af63e4eae3c102346ff169a6ac6dbe2b