From: yomguy <yomguy@parisson.com>
Date: Tue, 25 Oct 2011 10:09:48 +0000 (+0200)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.3.9~3^2~1^2~71
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8b42d0d680d0dbba4ac03464aa179696c1d46ad9;p=telemeta.git

Merge branch 'master' into crem
---

8b42d0d680d0dbba4ac03464aa179696c1d46ad9