From: Guillaume Pellerin Date: Fri, 31 May 2013 13:35:50 +0000 (+0200) Subject: Merge branch 'pro' of /var/git/teleforma into pro X-Git-Tag: 2.8.1-pro~484^2~13 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=eaefb86acd25ec7687a0e4a493fcbc9b8a915bc2;p=teleforma.git Merge branch 'pro' of /var/git/teleforma into pro --- eaefb86acd25ec7687a0e4a493fcbc9b8a915bc2