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

Merge branch 'master' into crem
---

1dfbe68fe52e605471e4f86beb8b462942632ca6