From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 10 Feb 2015 22:01:06 +0000 (+0100)
Subject: Merge branch 'dev' into crfpa
X-Git-Tag: 1.1~277
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5e24a7985c2fa6a46023f710d294c85e65776d6d;p=teleforma.git

Merge branch 'dev' into crfpa
---

5e24a7985c2fa6a46023f710d294c85e65776d6d