From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 21 May 2013 15:23:58 +0000 (+0200)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.4.5~2^2~4^2^2~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=26023550472e807a9ed49fe684c08696aa56cf88;p=telemeta.git

Merge branch 'dev' into crem2
---

26023550472e807a9ed49fe684c08696aa56cf88