From: yomguy <yomguy@parisson.com>
Date: Thu, 12 May 2011 00:02:14 +0000 (+0200)
Subject: merge from unstable 0.8.3
X-Git-Tag: 1.3.9~3^2~1^2~119
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f504eb3ab73a0411c75db5b3bbdaf897a5815fd0;p=telemeta.git

merge from unstable 0.8.3
---

f504eb3ab73a0411c75db5b3bbdaf897a5815fd0