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

Merge branch 'master' into crem
---

6ad36ead12d4363404074d474ee7449e646d0cb1