From: yomguy <yomguy@parisson.com>
Date: Fri, 18 Nov 2011 14:00:49 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.3.9~3^2~1^2~27
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7c58230ac341ac180471e550d026132bca7bfda6;p=telemeta.git

Merge branch 'master' into crem
---

7c58230ac341ac180471e550d026132bca7bfda6