From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 2 Jan 2014 11:02:23 +0000 (+0100)
Subject: Merge branch 'prodev' of git+ssh://vcs.parisson.com/var/git/teleforma into prodev
X-Git-Tag: 2.8.1-pro~325
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=521daef4b75892cd66011938382fff85f390aee2;p=teleforma.git

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

521daef4b75892cd66011938382fff85f390aee2