From: yomguy <yomguy@parisson.com>
Date: Tue, 7 Jun 2011 13:17:05 +0000 (+0200)
Subject: merge from unstable
X-Git-Tag: 1.5.0rc3~97^2~121
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=629153ec5b5a5a12568fe430d7453af726f68d88;p=telemeta.git

merge from unstable
---

629153ec5b5a5a12568fe430d7453af726f68d88