From: yomguy <yomguy@parisson.com>
Date: Wed, 18 Apr 2012 10:52:06 +0000 (+0200)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~24^2~7
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f0a2fee8565fab9f810a9b71ca28d0ee57b549ca;p=telemeta.git

Merge branch 'master' into crem
---

f0a2fee8565fab9f810a9b71ca28d0ee57b549ca