From: yomguy <yomguy@parisson.com>
Date: Mon, 16 Jul 2012 14:25: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~131
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e2f1b9cc219f4b0e8f55177000b38b459a0941f1;p=teleforma.git

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

e2f1b9cc219f4b0e8f55177000b38b459a0941f1