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/blogpost/resources.py | 2 +-
 examples/blogpost/tests.py     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'examples/blogpost')

diff --git a/examples/blogpost/resources.py b/examples/blogpost/resources.py
index d4e0594d..d11c5615 100644
--- a/examples/blogpost/resources.py
+++ b/examples/blogpost/resources.py
@@ -1,5 +1,5 @@
 from djangorestframework.resources import ModelResource
-from djangorestframework.utils import reverse
+from djangorestframework.reverse import reverse
 from blogpost.models import BlogPost, Comment
 
 
diff --git a/examples/blogpost/tests.py b/examples/blogpost/tests.py
index 9f72e686..23f1ac21 100644
--- a/examples/blogpost/tests.py
+++ b/examples/blogpost/tests.py
@@ -5,7 +5,7 @@ from django.test import TestCase
 from django.utils import simplejson as json
 
 from djangorestframework.compat import RequestFactory
-from djangorestframework.utils import reverse
+from djangorestframework.reverse import reverse
 from djangorestframework.views import InstanceModelView, ListOrCreateModelView
 
 from blogpost import models, urls
-- 
cgit v1.2.3