From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 2 Sep 2014 12:20:50 +0000 (+0200)
Subject: Merge branch 'crfpa' into dev
X-Git-Tag: 1.1~306
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d69a31590739ce246b149eec5929b22cee2181dc;p=teleforma.git

Merge branch 'crfpa' into dev
---

d69a31590739ce246b149eec5929b22cee2181dc