From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 12 Sep 2013 07:15:03 +0000 (+0200)
Subject: Merge branch 'crfpa' into icp
X-Git-Tag: 1.1~526^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0a9981bf355875e6c5f3d78959a9462e5b502728;p=teleforma.git

Merge branch 'crfpa' into icp
---

0a9981bf355875e6c5f3d78959a9462e5b502728