From: yomguy <yomguy@parisson.com>
Date: Wed, 18 Apr 2012 09:33:04 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://angus.parisson.com/var/git/teleforma
X-Git-Tag: 0.2~11
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a2ac436f51c8f8aaa04e065d90c6d7ebfaf21466;p=teleforma.git

Merge branch 'master' of git+ssh://angus.parisson.com/var/git/teleforma

Conflicts:
	teleforma/views.py
---

a2ac436f51c8f8aaa04e065d90c6d7ebfaf21466