From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 17 Jul 2013 17:12:38 +0000 (+0200)
Subject: Merge branch 'crfpa' into tc202
X-Git-Tag: 1.3-TC~29^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3fc70b90db10e82fc19b29f3b91ce39953e4cca7;p=teleforma.git

Merge branch 'crfpa' into tc202

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

3fc70b90db10e82fc19b29f3b91ce39953e4cca7