From: yomguy <yomguy@parisson.com>
Date: Fri, 17 Feb 2012 11:41:43 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~35^2~20
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=aadc3d609a9b502e3ec292786bdfbc9e41ac13d0;p=telemeta.git

Merge branch 'master' into crem
---

aadc3d609a9b502e3ec292786bdfbc9e41ac13d0