From: yomguy <yomguy@parisson.com>
Date: Wed, 17 Jul 2013 13:57:47 +0000 (+0200)
Subject: Merge branch 'tc202' of git+ssh://vcs.parisson.com/var/git/teleforma into tc202
X-Git-Tag: 1.3-TC~33
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1e5fd9aada94403db4ec35a09f49ee03b1237623;p=teleforma.git

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

1e5fd9aada94403db4ec35a09f49ee03b1237623