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

Merge branch 'master' into crem
---

d81cd482ea57b0185c5b81406809721942a23414