From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 4 Feb 2013 23:17:43 +0000 (+0100)
Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
X-Git-Tag: 1.3-TC~46^2^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b32095212ead9f50e36ae996689a9e132f0b5e2a;p=teleforma.git

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

b32095212ead9f50e36ae996689a9e132f0b5e2a