From: yomguy <yomguy@parisson.com>
Date: Mon, 2 Apr 2012 10:27:38 +0000 (+0200)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~33^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3e6981083179864bf5cb2ac51374048780c9f305;p=telemeta.git

Merge branch 'master' into crem
---

3e6981083179864bf5cb2ac51374048780c9f305