From: Yoan Le Clanche <yoan@probarreau.pilotsystems.net>
Date: Wed, 13 Feb 2013 15:25:38 +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~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=233091a01e95c187c9209179f06da5f09416afdd;p=teleforma.git

Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro
---

233091a01e95c187c9209179f06da5f09416afdd