From: Yoan Le Clanche Date: Fri, 15 Feb 2013 17:23:06 +0000 (+0100) Subject: Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro X-Git-Tag: 0.9-probarreau~56^2~1 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=767b82ed82b7328aa79323bb5bab92d7679a0161;p=teleforma.git Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro --- 767b82ed82b7328aa79323bb5bab92d7679a0161