From: yomguy <yomguy@parisson.com>
Date: Tue, 14 Feb 2012 00:35:31 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~35^2~24
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f5ee84d112bb2e7467d42b7d86328f10bba91b1f;p=telemeta.git

Merge branch 'master' into crem
---

f5ee84d112bb2e7467d42b7d86328f10bba91b1f