From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 11 Jun 2014 07:44:46 +0000 (+0200)
Subject: Merge branch 'prodev' into pro
X-Git-Tag: 2.8.1-pro~285
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=413b0751f8aa37c27d0d2c0d99ec0a57269f6079;p=teleforma.git

Merge branch 'prodev' into pro
---

413b0751f8aa37c27d0d2c0d99ec0a57269f6079