Merge cacheimp -> master

[osqa.git] / forum / utils / html.py

diff --git a/forum/utils/html.py b/forum/utils/html.py
index bf84e2f641c49c519fe6163f615468f42231c778..28a6a4b9647fe990dca340d502102c44a542e7ff 100644 (file)
--- a/forum/utils/html.py
+++ b/forum/utils/html.py
@@ -3,7 +3,7 @@
 from html5lib import sanitizer, serializer, tokenizer, treebuilders, treewalkers, HTMLParser
 from django.utils.html import strip_tags
 from forum.utils.html2text import HTML2Text
-from django.template import mark_safe
+from django.utils.safestring import mark_safe
 from forum import settings
 
 class HTMLSanitizerMixin(sanitizer.HTMLSanitizerMixin):