From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 22 Jul 2013 08:46:22 +0000 (+0200)
Subject: Merge branch 'crfpa' into tc202
X-Git-Tag: 1.3-TC~28^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8f5879e7a34b2e6de640b63bdb917c1996b3194d;p=teleforma.git

Merge branch 'crfpa' into tc202

Conflicts:
	teleforma/views/core.py
---

8f5879e7a34b2e6de640b63bdb917c1996b3194d