From: yomguy <yomguy@parisson.com>
Date: Mon, 16 May 2011 18:42:41 +0000 (+0200)
Subject: merge from unstable r848
X-Git-Tag: 1.3.9~3^2~1^2~116
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0dbed051172f7eb5039d7a340c8b2a575e780001;p=telemeta.git

merge from unstable r848
---

0dbed051172f7eb5039d7a340c8b2a575e780001