From: yomguy <yomguy@parisson.com>
Date: Mon, 18 Feb 2013 12:12:24 +0000 (+0100)
Subject: Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro
X-Git-Tag: 0.9-probarreau~56
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9298aa775e1a1678f6062fe330cb3ef1598f00ff;p=teleforma.git

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

9298aa775e1a1678f6062fe330cb3ef1598f00ff