From: Guillaume Pellerin <yomguy@parisson.com>
Date: Sun, 29 Jul 2012 18:09:04 +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^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6124f1cc4697fb04cf82ae9f8b101e4ee2ef6ad6;p=teleforma.git

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

6124f1cc4697fb04cf82ae9f8b101e4ee2ef6ad6