Merge remote-tracking branch 'upstream/master' into related-required

1 files changed, 1 insertions, 1 deletions

diff --git a/rest_framework/urls.py b/rest_framework/urls.py
index bcdc23e7..fbe4bc07 100644
--- a/rest_framework/urls.py
+++ b/rest_framework/urls.py
@@ -12,7 +12,7 @@ your authentication settings include `SessionAuthentication`.
         url(r'^auth', include('rest_framework.urls', namespace='rest_framework'))
     )
 """
-from django.conf.urls.defaults import patterns, url
+from rest_framework.compat import patterns, url
 
 
 template_name = {'template_name': 'rest_framework/login.html'}