From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 6 Jun 2013 08:43:47 +0000 (+0200)
Subject: Merge branch 'pro' of /var/git/teleforma into pro
X-Git-Tag: 2.8.1-pro~484^2~11
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=af643a91aa3a90597a1e570b681e137852d22934;p=teleforma.git

Merge branch 'pro' of /var/git/teleforma into pro
---

af643a91aa3a90597a1e570b681e137852d22934