From: yomguy <yomguy@parisson.com>
Date: Wed, 8 Jun 2011 12:25:07 +0000 (+0200)
Subject: merge unstable
X-Git-Tag: 1.3.9~3^2~1^2~97
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=88cddb5b3947bf478bf514bcf688588f46a5f122;p=telemeta.git

merge unstable
---

88cddb5b3947bf478bf514bcf688588f46a5f122