From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 21 Jul 2014 14:43:02 +0000 (+0200)
Subject: Merge branch 'pro' into prodev
X-Git-Tag: 2.8.1-pro~282^2~60
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=68dd5fbb8e23e8a7376c56bef46bfd39e388e013;p=teleforma.git

Merge branch 'pro' into prodev
---

68dd5fbb8e23e8a7376c56bef46bfd39e388e013