From: yomguy <yomguy@parisson.com>
Date: Thu, 6 Dec 2012 11:21:40 +0000 (+0100)
Subject: Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev
X-Git-Tag: 1.3-TC~56
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=862277b8915de47bf448980196b3ff647db0ea7f;p=teleforma.git

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

Conflicts:
	teleforma/context_processors.py
---

862277b8915de47bf448980196b3ff647db0ea7f