From: yomguy <yomguy@parisson.com>
Date: Thu, 1 Dec 2011 16:59:44 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.3.9~3^2~1^2~7
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2eab08f0977381d4269df4f2ac2dde74181f8471;p=telemeta.git

Merge branch 'master' into crem
---

2eab08f0977381d4269df4f2ac2dde74181f8471