From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 29 Jan 2015 17:20:13 +0000 (+0100)
Subject: Merge branch 'crfpa' into dev
X-Git-Tag: 1.1~303
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b1e95aa34d66b10b065ab6fc202d91eb6ce536b2;p=teleforma.git

Merge branch 'crfpa' into dev
---

b1e95aa34d66b10b065ab6fc202d91eb6ce536b2