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

Merge branch 'dev' into crfpa
---

52f4f8c8d4879ed270c831fa89c3c782d0dd8301