From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 23 Apr 2013 13:43:19 +0000 (+0200)
Subject: Merge branch 'prodev' of /var/git/teleforma into prodev
X-Git-Tag: 2.8.1-pro~491
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d9501a6efd449a5fb3c3c9cd26018e5850b262a2;p=teleforma.git

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

Conflicts:
	teleforma/pages/fr/help.rst
---

d9501a6efd449a5fb3c3c9cd26018e5850b262a2