From: yomguy <yomguy@parisson.com>
Date: Wed, 18 May 2011 10:40:20 +0000 (+0200)
Subject: merge unstable r852
X-Git-Tag: 1.3.9~3^2~1^2~114
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fa5d628f9d337bd90fbd5a8795174cbed774e766;p=telemeta.git

merge unstable r852
---

fa5d628f9d337bd90fbd5a8795174cbed774e766