From: yomguy <yomguy@parisson.com>
Date: Tue, 24 May 2011 09:26:08 +0000 (+0200)
Subject: merge unstable r858
X-Git-Tag: 1.3.9~3^2~1^2~109
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fce8edce976c9e73d338bacdfb4799f0f8d28052;p=telemeta.git

merge unstable r858
---

fce8edce976c9e73d338bacdfb4799f0f8d28052