From: Guillaume Pellerin Date: Wed, 12 Jun 2013 19:41:13 +0000 (+0200) Subject: Merge branch 'pro' of /var/git/teleforma into pro X-Git-Tag: 2.8.1-pro~484^2~9 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=49bbef7e9b7dfebc232130e7c0f05a7081f820d3;p=teleforma.git Merge branch 'pro' of /var/git/teleforma into pro --- 49bbef7e9b7dfebc232130e7c0f05a7081f820d3