From: yomguy <yomguy@parisson.com>
Date: Mon, 16 May 2011 19:48:21 +0000 (+0200)
Subject: merge from unstable r851
X-Git-Tag: 1.5.0rc3~97^2~134
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a0d70670e6d7a6956f63b4e09238a9d9804061af;p=telemeta.git

merge from unstable r851
---

a0d70670e6d7a6956f63b4e09238a9d9804061af