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

Merge branch 'master' into crem
---

87ca04c08895072d0fb95ec0fd8e85a4d0e5d738