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

Merge branch 'master' into crem
---

7bc9e8fa7e35a6fc68899923500f1fc683611996