From: yomguy <yomguy@parisson.com>
Date: Tue, 2 Oct 2012 21:43:18 +0000 (+0200)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~23^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=10990dcda534d49081ce4ff5f56e95f008e1acf1;p=telemeta.git

Merge branch 'master' into crem
---

10990dcda534d49081ce4ff5f56e95f008e1acf1