From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 9 Feb 2015 09:14:52 +0000 (+0100)
Subject: Merge branch 'dev' into crfpa
X-Git-Tag: 1.1~293
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=46def40041a8dce8657bc7bd0a54b46b335fdd8a;p=teleforma.git

Merge branch 'dev' into crfpa
---

46def40041a8dce8657bc7bd0a54b46b335fdd8a