From: yomguy <yomguy@parisson.com>
Date: Mon, 13 Feb 2012 22:09:02 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~35^2~28
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=16383f084cc2bf3473b1d77ed0daf2ca0adb0ffa;p=telemeta.git

Merge branch 'master' into crem
---

16383f084cc2bf3473b1d77ed0daf2ca0adb0ffa