From: yomguy <yomguy@parisson.com>
Date: Mon, 28 Jan 2013 14:45:20 +0000 (+0100)
Subject: Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro
X-Git-Tag: 0.9-probarreau~93
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b8163fa5a7144379536e6948d3cc395cb22a2411;p=teleforma.git

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

b8163fa5a7144379536e6948d3cc395cb22a2411