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

Merge branch 'dev' into crfpa
---

6a8a4e8de07f86a3275bd21d17460cf1628d6a26