From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 9 Feb 2015 09:56:29 +0000 (+0100)
Subject: Merge branch 'dev' into crfpa
X-Git-Tag: 1.1~292
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0a486d4b74f52e408013b5da13b2ea781aaddc34;p=teleforma.git

Merge branch 'dev' into crfpa
---

0a486d4b74f52e408013b5da13b2ea781aaddc34