From: yomguy <yomguy@parisson.com>
Date: Mon, 22 Jul 2013 13:24:26 +0000 (+0200)
Subject: Merge branch 'tc202' of git+ssh://vcs.parisson.com/var/git/teleforma into tc202
X-Git-Tag: 1.3-TC~26
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4e275deb120cba37f277f794e9924cecaa0a994c;p=teleforma.git

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

4e275deb120cba37f277f794e9924cecaa0a994c