From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 11 Jul 2014 09:41:44 +0000 (+0200)
Subject: Merge branch 'prodev' into pro
X-Git-Tag: 2.8.1-pro~282^2~171
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=024756e61d7469966279b805fe799535d4a0f098;p=teleforma.git

Merge branch 'prodev' into pro
---

024756e61d7469966279b805fe799535d4a0f098