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

Merge branch 'master' into crem
---

dec34fde869d9ef6a87ff63f8a2c1301470a7a53