From: Yoan Le Clanche Date: Mon, 18 Feb 2013 11:03:07 +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 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a47301e1b2ee94a300974800f43c8d012c0b33b0;p=teleforma.git Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro --- a47301e1b2ee94a300974800f43c8d012c0b33b0