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

Merge branch 'master' into crem
---

2574fcbfa047aa67c3cdc0543e373743baabd697