From: yomguy <yomguy@parisson.com>
Date: Tue, 6 Dec 2011 23:05:06 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.3.9~3^2~1^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c6401d6e667c9c2e932913971c2daed777f96207;p=telemeta.git

Merge branch 'master' into crem
---

c6401d6e667c9c2e932913971c2daed777f96207