From: yomguy <yomguy@parisson.com>
Date: Mon, 23 May 2011 15:46:55 +0000 (+0200)
Subject: merge unstable r854 and r855
X-Git-Tag: 1.3.9~3^2~1^2~112
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8f6d73f2c60cab1141efdaf7a1c4dbe564737f87;p=telemeta.git

merge unstable r854 and r855
---

8f6d73f2c60cab1141efdaf7a1c4dbe564737f87