Merge branch '2.4.0' of github.com:tomchristie/django-rest-framework into #1559

Conflicts:
	docs/topics/release-notes.md

1 files changed, 1 insertions, 1 deletions

diff --git a/rest_framework/urls.py b/rest_framework/urls.py
index 9c4719f1..87ec0f0a 100644
--- a/rest_framework/urls.py
+++ b/rest_framework/urls.py
@@ -13,7 +13,7 @@ your authentication settings include `SessionAuthentication`.
     )
 """
 from __future__ import unicode_literals
-from rest_framework.compat import patterns, url
+from django.conf.urls import patterns, url
 
 
 template_name = {'template_name': 'rest_framework/login.html'}