From: yomguy <yomguy@parisson.com>
Date: Wed, 21 Mar 2012 16:32:11 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~35^2~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d79cb26a823fdea81d4fa7d575ce380af736987e;p=telemeta.git

Merge branch 'master' into crem
---

d79cb26a823fdea81d4fa7d575ce380af736987e