From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Mon, 6 Jun 2011 12:51:17 +0000 (-0500)
Subject: Merge remote branch 'remotes/gandaro/324-bad-media-types'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2190ecde8d7ad77daf5e70c165bd36cc4d7e634d;p=mediagoblin.git

Merge remote branch 'remotes/gandaro/324-bad-media-types'
---

2190ecde8d7ad77daf5e70c165bd36cc4d7e634d
diff --cc mediagoblin/submit/views.py
index b409b64d,5ddf992f..e9b5c37e
--- a/mediagoblin/submit/views.py
+++ b/mediagoblin/submit/views.py
@@@ -17,11 -17,11 +17,11 @@@
  from os.path import splitext
  from cgi import FieldStorage
  
 -from webob import Response, exc
  from werkzeug.utils import secure_filename
  
 +from mediagoblin.util import render_to_response, redirect
  from mediagoblin.decorators import require_active_login
- from mediagoblin.submit import forms as submit_forms
+ from mediagoblin.submit import forms as submit_forms, security
  from mediagoblin.process_media import process_media_initial