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, 25 deletions

diff --git a/examples/mixin/urls.py b/examples/mixin/urls.py
deleted file mode 100644
index 900c532e..00000000
--- a/examples/mixin/urls.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from djangorestframework.compat import View  # Use Django 1.3's django.views.generic.View, or fall back to a clone of that if Django < 1.3
-from djangorestframework.mixins import ResponseMixin
-from djangorestframework.renderers import DEFAULT_RENDERERS
-from djangorestframework.response import Response
-from djangorestframework.reverse import reverse
-
-from django.conf.urls.defaults import patterns, url
-
-
-class ExampleView(ResponseMixin, View):
-    """An example view using Django 1.3's class based views.
-    Uses djangorestframework's RendererMixin to provide support for multiple
-    output formats."""
-    renderers = DEFAULT_RENDERERS
-
-    def get(self, request):
-        url = reverse('mixin-view', request=request)
-        response = Response(200, {'description': 'Some example content',
-                                  'url': url})
-        return self.render(response)
-
-
-urlpatterns = patterns('',
-    url(r'^$', ExampleView.as_view(), name='mixin-view'),
-)