From 44ceef841543877a700c3fb4a0f84dfecbad0cbb Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 21 Aug 2013 21:30:25 +0100
Subject: Updating 2.4.0 release notes

---
 rest_framework/compat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/compat.py')

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index baee3a9c..178a697f 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -14,7 +14,7 @@ from django.conf import settings
 try:
     from django.utils import six
 except ImportError:
-    from rest_framework import six
+    import six
 
 # location of patterns, url, include changes in 1.4 onwards
 try:
-- 
cgit v1.2.3