Merge branch 'master' into derek-moore-bug405_email_notifications_for_comments

Conflicts:
	mediagoblin/db/mongo/migrations.py

mediagoblin/user_pages/forms.py

@@ -21,7 +21,7 @@ from mediagoblin.tools.translate import fake_ugettext_passthrough as _
 
 class MediaCommentForm(wtforms.Form):
     comment_content = wtforms.TextAreaField(
-        _(''),
+        '',
         [wtforms.validators.Required()])
 
 

mediagoblin/user_pages/views.py

@@ -180,6 +180,10 @@ def media_confirm_delete(request, media):
         if form.confirm.data is True:
             username = media.get_uploader.username
 
+            # Delete all the associated comments
+            for comment in media.get_comments():
+                comment.delete()
+
             # Delete all files on the public storage
             delete_media_files(media)