From: yomguy <yomguy@parisson.com>
Date: Wed, 8 Jun 2011 10:50:01 +0000 (+0200)
Subject: merge unstable
X-Git-Tag: 1.3.9~3^2~1^2~99
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=74fa706462dd8ea14b3bfd1216731370bd7324e1;p=telemeta.git

merge unstable
---

74fa706462dd8ea14b3bfd1216731370bd7324e1