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

Merge branch 'master' into crem
---

8d839d1e437f4496ccded6fc0a890d476360bfe0