From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 19 Nov 2013 15:05:39 +0000 (+0100)
Subject: Merge branch 'crfpa' of git+ssh://vcs.parisson.com/var/git/teleforma into crfpa
X-Git-Tag: 1.1~502
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fb994124c9f226290f01a2f3e73fdea591239558;p=teleforma.git

Merge branch 'crfpa' of git+ssh://vcs.parisson.com/var/git/teleforma into crfpa

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

fb994124c9f226290f01a2f3e73fdea591239558