From: yomguy <yomguy@parisson.com>
Date: Thu, 27 Oct 2011 10:37:51 +0000 (+0200)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.3.9~3^2~1^2~68
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=03f16acc2d268fc82776aa6d542c4a5d7a381b5d;p=telemeta.git

Merge branch 'master' into crem
---

03f16acc2d268fc82776aa6d542c4a5d7a381b5d