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

author yomguy <yomguy@parisson.com>

Wed, 18 Apr 2012 09:33:04 +0000 (11:33 +0200)

committer yomguy <yomguy@parisson.com>

Wed, 18 Apr 2012 09:33:04 +0000 (11:33 +0200)
author yomguy <yomguy@parisson.com>
Wed, 18 Apr 2012 09:33:04 +0000 (11:33 +0200)
committer yomguy <yomguy@parisson.com>
Wed, 18 Apr 2012 09:33:04 +0000 (11:33 +0200)
diff --cc teleforma/models.py
Simple merge
diff --cc teleforma/views.py
Simple merge
author	yomguy <yomguy@parisson.com>
	Wed, 18 Apr 2012 09:33:04 +0000 (11:33 +0200)
committer	yomguy <yomguy@parisson.com>
	Wed, 18 Apr 2012 09:33:04 +0000 (11:33 +0200)
		1	2
teleforma/models.py	patch \|	diff1 \|	diff2 \|	blob \| history
teleforma/views.py	patch \|	diff1 \|	diff2 \|	blob \| history