Merge remote-tracking branch 'origin/master' into is315

author cfdv <caldavis@gmail.com>

Mon, 20 Jun 2011 17:50:44 +0000 (12:50 -0500)

committer cfdv <caldavis@gmail.com>

Mon, 20 Jun 2011 17:50:44 +0000 (12:50 -0500)
author cfdv <caldavis@gmail.com>
Mon, 20 Jun 2011 17:50:44 +0000 (12:50 -0500)
committer cfdv <caldavis@gmail.com>
Mon, 20 Jun 2011 17:50:44 +0000 (12:50 -0500)
diff --cc mediagoblin/db/models.py
Simple merge
diff --cc mediagoblin/edit/views.py
Simple merge
author	cfdv <caldavis@gmail.com>
	Mon, 20 Jun 2011 17:50:44 +0000 (12:50 -0500)
committer	cfdv <caldavis@gmail.com>
	Mon, 20 Jun 2011 17:50:44 +0000 (12:50 -0500)
		1	2
mediagoblin/db/models.py	patch \|	diff1 \|	diff2 \|	blob \| history
mediagoblin/edit/views.py	patch \|	diff1 \|	diff2 \|	blob \| history