Merge branch 'restframework2' into rest-framework-2-merge2.0.0

Conflicts:
	.gitignore
	.travis.yml
	AUTHORS
	README.rst
	djangorestframework/mixins.py
	djangorestframework/renderers.py
	djangorestframework/resources.py
	djangorestframework/serializer.py
	djangorestframework/templates/djangorestframework/base.html
	djangorestframework/templates/djangorestframework/login.html
	djangorestframework/templatetags/add_query_param.py
	djangorestframework/tests/accept.py
	djangorestframework/tests/authentication.py
	djangorestframework/tests/content.py
	djangorestframework/tests/reverse.py
	djangorestframework/tests/serializer.py
	djangorestframework/views.py
	docs/examples.rst
	docs/examples/blogpost.rst
	docs/examples/modelviews.rst
	docs/examples/objectstore.rst
	docs/examples/permissions.rst
	docs/examples/pygments.rst
	docs/examples/views.rst
	docs/howto/alternativeframeworks.rst
	docs/howto/mixin.rst
	docs/howto/reverse.rst
	docs/howto/usingurllib2.rst
	docs/index.rst
	docs/topics/release-notes.md
	examples/sandbox/views.py
	rest_framework/__init__.py
	rest_framework/compat.py
	rest_framework/utils/breadcrumbs.py
	setup.py

1 files changed, 0 insertions, 20 deletions

diff --git a/djangorestframework/reverse.py b/djangorestframework/reverse.py
deleted file mode 100644
index ba663f98..00000000
--- a/djangorestframework/reverse.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-Provide reverse functions that return fully qualified URLs
-"""
-from django.core.urlresolvers import reverse as django_reverse
-from django.utils.functional import lazy
-
-
-def reverse(viewname, *args, **kwargs):
-    """
-    Same as `django.core.urlresolvers.reverse`, but optionally takes a request
-    and returns a fully qualified URL, using the request to get the base URL.
-    """
-    request = kwargs.pop('request', None)
-    url = django_reverse(viewname, *args, **kwargs)
-    if request:
-        return request.build_absolute_uri(url)
-    return url
-
-
-reverse_lazy = lazy(reverse, str)