From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 10 Jun 2014 11:52:56 +0000 (+0200)
Subject: Merge branch 'prodev' into pro
X-Git-Tag: 2.8.1-pro~286
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=db5f37b2c0fee06bd5067ba4746276a7964e8312;p=teleforma.git

Merge branch 'prodev' into pro
---

db5f37b2c0fee06bd5067ba4746276a7964e8312