From: yomguy <yomguy@parisson.com>
Date: Tue, 3 Apr 2012 10:38:57 +0000 (+0200)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~29^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=41c9e19165a93e616468dda8b823b425f921b36f;p=telemeta.git

Merge branch 'master' into crem
---

41c9e19165a93e616468dda8b823b425f921b36f