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