From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 10 Dec 2013 15:00:48 +0000 (+0100)
Subject: Merge branch 'prodev' of /var/git/teleforma into prodev
X-Git-Tag: 2.8.1-pro~462
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3c2aa3a56a79ba40e8bd9f426bfdaabf341bd28c;p=teleforma.git

Merge branch 'prodev' of /var/git/teleforma into prodev
---

3c2aa3a56a79ba40e8bd9f426bfdaabf341bd28c