From: yomguy <yomguy@parisson.com>
Date: Mon, 30 May 2011 09:16:48 +0000 (+0200)
Subject: merge unstable up to 874
X-Git-Tag: 1.3.9~3^2~1^2~106
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7ef47c1eaffc33f50360a98def363f42c6f17d19;p=telemeta.git

merge unstable up to 874
---

7ef47c1eaffc33f50360a98def363f42c6f17d19