From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 13 Mar 2013 18:09:27 +0000 (+0100)
Subject: Merge branch 'pro' of /var/git/teleforma into pro
X-Git-Tag: 2.8.1-pro~491^2~8
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3ec35e3510bbc90e704aa66e252dc603e1433b6e;p=teleforma.git

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

3ec35e3510bbc90e704aa66e252dc603e1433b6e