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

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

a1496f8b2f208aaca586f0c7303995298b5a4ea0