From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 21 May 2013 15:25:27 +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=aca5a714ab74fa5c0480756ff259f554164591ff;p=telemeta.git

Merge branch 'dev' into crem2
---

aca5a714ab74fa5c0480756ff259f554164591ff