From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 25 Jul 2012 16:12:18 +0000 (+0200)
Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
X-Git-Tag: 0.8.3~15
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9135a8f4c0595c8a6abc4438ac02ec3adaa48317;p=teleforma.git

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

9135a8f4c0595c8a6abc4438ac02ec3adaa48317