From 5fd4c639d7c64572dd07dc31dcd627bed9469b05 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 21 Feb 2012 20:57:36 +0000
Subject: Merge master into develop

---
 examples/resourceexample/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/resourceexample')

diff --git a/examples/resourceexample/views.py b/examples/resourceexample/views.py
index f2a7a08a..8e7be302 100644
--- a/examples/resourceexample/views.py
+++ b/examples/resourceexample/views.py
@@ -1,4 +1,4 @@
-from djangorestframework.utils import reverse
+from djangorestframework.reverse import reverse
 from djangorestframework.views import View
 from djangorestframework.response import Response
 from djangorestframework import status
-- 
cgit v1.2.3