From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 9 Sep 2013 11:04:02 +0000 (+0200)
Subject: Merge branch 'crfpa' into ae
X-Git-Tag: 2.8.1-ae~112
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bc54241f68ad472e5f0380bbe5fbcd2be615d30b;p=teleforma.git

Merge branch 'crfpa' into ae

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

bc54241f68ad472e5f0380bbe5fbcd2be615d30b