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

Merge branch 'master' into crem
---

2b70ae31ade8e9da1952e0cec25e78978b5270e7