From aa239e3e5405933af6a29dac3cf587b59a099927 Mon Sep 17 00:00:00 2001
From: Justin Bronn <jbronn@gmail.com>
Date: Tue, 5 Aug 2008 17:15:33 +0000
Subject: gis: Merged revisions
 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214
 via svnmerge from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/utils/encoding.py | 2 --
 1 file changed, 2 deletions(-)

(limited to 'django/utils/encoding.py')

diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 33bb37b0ea..c54e67610f 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -1,9 +1,7 @@
 import types
 import urllib
 import datetime
-
 from django.utils.functional import Promise
-from django.utils.safestring import SafeData, mark_safe
 
 class DjangoUnicodeDecodeError(UnicodeDecodeError):
     def __init__(self, obj, *args):
-- 
cgit v1.2.1