From: yomguy <yomguy@parisson.com>
Date: Fri, 14 Dec 2012 10:02:43 +0000 (+0100)
Subject: Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro
X-Git-Tag: 0.9-probarreau~260
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6e7fa88e6e633e4b1fbef0ae60762ee968472cf0;p=teleforma.git

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

6e7fa88e6e633e4b1fbef0ae60762ee968472cf0