From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 6 Dec 2013 20:48:22 +0000 (+0100)
Subject: Merge branch 'prodev' of /var/git/teleforma into prodev
X-Git-Tag: 2.8.1-pro~476
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=df696f34c49cb34f68159ef213e389d94c651c9a;p=teleforma.git

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

df696f34c49cb34f68159ef213e389d94c651c9a