From: yomguy <yomguy@parisson.com>
Date: Mon, 28 Nov 2011 10:09:06 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.3.9~3^2~1^2~22
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3471ccfa2b49033b27a09bb93f8d3fc78da8c9aa;p=telemeta.git

Merge branch 'master' into crem
---

3471ccfa2b49033b27a09bb93f8d3fc78da8c9aa