From: yomguy <yomguy@parisson.com>
Date: Tue, 24 May 2011 13:06:57 +0000 (+0200)
Subject: merge unstable r860
X-Git-Tag: 1.3.9~3^2~1^2~107
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f11cee947e2e8b3198cb83e3ab2f209d2449c507;p=telemeta.git

merge unstable r860
---

f11cee947e2e8b3198cb83e3ab2f209d2449c507