From: yomguy <yomguy@parisson.com>
Date: Tue, 18 Dec 2012 10:02:15 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~9
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c7299187e6b68719cd3cda01a6e57b2f886e05a0;p=telemeta.git

Merge branch 'master' into crem
---

c7299187e6b68719cd3cda01a6e57b2f886e05a0