From: yomguy <yomguy@parisson.com>
Date: Sat, 28 Jul 2012 22:24:08 +0000 (+0200)
Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
X-Git-Tag: 0.8.3~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=16144db8d3c8dd156b9e566dc47fd6c11e05a56c;p=teleforma.git

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

16144db8d3c8dd156b9e566dc47fd6c11e05a56c