From: yomguy <yomguy@parisson.com>
Date: Mon, 11 Feb 2013 10:30:12 +0000 (+0100)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.4.5~2^2~4^2~2^2~35
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f298e2ba8fe5b5cdfafb3d830a75fbd3d4b9d4f3;p=telemeta.git

Merge branch 'dev' into crem2
---

f298e2ba8fe5b5cdfafb3d830a75fbd3d4b9d4f3