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

Merge branch 'prodev' into pro
---

ff58db2b6fe1be91d72dbc1b4a536333d01fab8c