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

Merge branch 'master' into crem
---

897fe9569ce3399948a474c9a3bf526702b52160