From: Guillaume Pellerin Date: Sat, 28 Jul 2012 22:21:15 +0000 (+0200) Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev X-Git-Tag: 0.8.3~6^2 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=149cd6789b7ea4e14fd003bd0d1bcb24992e039d;p=teleforma.git Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev --- 149cd6789b7ea4e14fd003bd0d1bcb24992e039d