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

Merge branch 'master' into crem
---

e2fbee05a79dfc6fb9ce8d8170d0ee63fcc4b112