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

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

c6791f2a76c706dfb83b9103530859e88318499c