From: yomguy <yomguy@parisson.com>
Date: Mon, 2 Apr 2012 09:13:54 +0000 (+0200)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~35^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f4aa3e50a0eb21c2ca18e8d3eafc72efe63dd67f;p=telemeta.git

Merge branch 'master' into crem
---

f4aa3e50a0eb21c2ca18e8d3eafc72efe63dd67f