From: yomguy <yomguy@parisson.com>
Date: Tue, 27 Mar 2012 15:46:32 +0000 (+0200)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~35^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7c5a5ad9d0e025fc463119a93d0e94da50d8af01;p=telemeta.git

Merge branch 'master' into crem
---

7c5a5ad9d0e025fc463119a93d0e94da50d8af01