From: yomguy <yomguy@parisson.com>
Date: Wed, 13 Mar 2013 13:35:50 +0000 (+0100)
Subject: Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro
X-Git-Tag: 2.8.1-pro~491^2~10
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=feb696ff15e46ffa3f3f96d03a9c6e3b66ccf082;p=teleforma.git

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

feb696ff15e46ffa3f3f96d03a9c6e3b66ccf082