From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 9 Sep 2013 14:39:26 +0000 (+0200)
Subject: Merge branch 'prodev' of /var/git/teleforma into prodev
X-Git-Tag: 2.8.1-pro~484
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6b3a42db2e8429b48ba212c2d9e956860b3b520a;p=teleforma.git

Merge branch 'prodev' of /var/git/teleforma into prodev

Conflicts:
	teleforma/templatetags/teleforma_tags.py
---

6b3a42db2e8429b48ba212c2d9e956860b3b520a