From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 12 Sep 2013 07:37:41 +0000 (+0200)
Subject: Merge branch 'crfpa' into tc202
X-Git-Tag: 1.3-TC~23^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=121264b564efb5e8b3a99ad8fac0ce8743b9f3ad;p=teleforma.git

Merge branch 'crfpa' into tc202

Conflicts:
	teleforma/locale/fr/LC_MESSAGES/django.mo
---

121264b564efb5e8b3a99ad8fac0ce8743b9f3ad