From: yomguy <yomguy@parisson.com>
Date: Tue, 31 Jul 2012 21:32:34 +0000 (+0200)
Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
X-Git-Tag: 0.8.4^2~8
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0e04540ba8f28a566c6a50b2533d1edb4877060c;p=teleforma.git

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

0e04540ba8f28a566c6a50b2533d1edb4877060c