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

Merge branch 'master' into crem
---

18bfbcf240d2408d0daa5ccd42e56573f64f2309