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

diff --git a/examples/modelresourceexample/resources.py b/examples/modelresourceexample/resources.py
deleted file mode 100644
index b74b0572..00000000
--- a/examples/modelresourceexample/resources.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from djangorestframework.resources import ModelResource
-from djangorestframework.reverse import reverse
-from modelresourceexample.models import MyModel
-
-
-class MyModelResource(ModelResource):
-    model = MyModel
-    fields = ('foo', 'bar', 'baz', 'url')
-    ordering = ('created',)
-
-    def url(self, instance):
-        return reverse('model-resource-instance',
-                       kwargs={'id': instance.id},
-                       request=self.request)