From: yomguy <yomguy@parisson.com>
Date: Fri, 15 Feb 2013 14:31:00 +0000 (+0100)
Subject: Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro
X-Git-Tag: 0.9-probarreau~64
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2370479387cfcdc9a9032269e4f54cd817cf292a;p=teleforma.git

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

2370479387cfcdc9a9032269e4f54cd817cf292a