From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 15 May 2013 09:27:49 +0000 (+0200)
Subject: Merge branch 'crem2' into dev2
X-Git-Tag: 1.4.5~2^2~4^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=56cafc036082a7e819dafc56555c2a4207b7b0c9;p=telemeta.git

Merge branch 'crem2' into dev2
---

56cafc036082a7e819dafc56555c2a4207b7b0c9