From: Yoan Le Clanche Date: Mon, 28 Jan 2013 14:30:07 +0000 (+0100) Subject: Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro X-Git-Tag: 0.9-probarreau~93^2 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=dd3b2b2664f49559b8d09c922c0448baf5b20da4;p=teleforma.git Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro --- dd3b2b2664f49559b8d09c922c0448baf5b20da4