From: yomguy <yomguy@parisson.com>
Date: Wed, 2 Jan 2013 16:16:59 +0000 (+0100)
Subject: Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro
X-Git-Tag: 0.9-probarreau~185
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=282c4c48923ab18ddb37b0eb4630f536eaef1ee2;p=teleforma.git

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

282c4c48923ab18ddb37b0eb4630f536eaef1ee2