From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 16 Apr 2013 15:51:55 +0000 (+0200)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.4.5~2^2~4^2~2^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0ff47b4ee3804e3ccdec0f4e8adf2ad01cc842b3;p=telemeta.git

Merge branch 'dev' into crem2
---

0ff47b4ee3804e3ccdec0f4e8adf2ad01cc842b3