From: yomguy <yomguy@parisson.com>
Date: Tue, 27 Mar 2012 15:45:13 +0000 (+0200)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~35^2~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a939a2f9fbb9087f182d3c0e7c0a59752ab594ea;p=telemeta.git

Merge branch 'master' into crem
---

a939a2f9fbb9087f182d3c0e7c0a59752ab594ea