From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 5 May 2014 08:04:39 +0000 (+0200)
Subject: Merge branch 'prodev' into pro
X-Git-Tag: 2.8.1-pro~289
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8be0b7883efa62a542393f9c13f2e29d0cd266ec;p=teleforma.git

Merge branch 'prodev' into pro
---

8be0b7883efa62a542393f9c13f2e29d0cd266ec