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

Merge branch 'master' into crem
---

4d6b8cce72b9bb84d4a319ebfe36f9f49b6aa98e