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

Merge branch 'crem2' into dev2
---

54cb70ba46ee03ca0067a8ee6ff0b21f8c94b740