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

Merge branch 'master' into crem
---

0312960c0fb1d29d9a0522f52efe0618ac23847b