From: Guillaume Pellerin Date: Fri, 11 Jul 2014 09:41:54 +0000 (+0200) Subject: Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro X-Git-Tag: 2.8.1-pro~282^2~170 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=614afc10842cd6a4cbd0ccd869d84e7e3074c363;p=teleforma.git Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro --- 614afc10842cd6a4cbd0ccd869d84e7e3074c363