From: yomguy <yomguy@parisson.com>
Date: Thu, 19 Jul 2012 11:50:58 +0000 (+0200)
Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
X-Git-Tag: 0.7-dev^2~56
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ba1345aa6074e963a3111832f241fd48f0833588;p=teleforma.git

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

ba1345aa6074e963a3111832f241fd48f0833588