From: Gaël Lemignot Date: Wed, 12 Dec 2012 14:32:17 +0000 (+0100) Subject: Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro X-Git-Tag: 0.9-probarreau~260^2 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=eb1f1b629bade28cdbf165577b2e8ce74319ac26;p=teleforma.git Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro --- eb1f1b629bade28cdbf165577b2e8ce74319ac26