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

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

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

ff1835f53e40ee4946944693333fc867e9acb9c4