From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 12 Jun 2013 11:10:45 +0000 (+0200)
Subject: Merge branch 'pro' into prodev
X-Git-Tag: 2.8.1-pro~487^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cf73fe1e0679443b968f735e95a5e45cc45cbe02;p=teleforma.git

Merge branch 'pro' into prodev
---

cf73fe1e0679443b968f735e95a5e45cc45cbe02