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

diff --git a/examples/blogpost/resources.py b/examples/blogpost/resources.py
deleted file mode 100644
index c3166bcf..00000000
--- a/examples/blogpost/resources.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from djangorestframework.resources import ModelResource
-from djangorestframework.reverse import reverse
-from blogpost.models import BlogPost, Comment
-
-
-class BlogPostResource(ModelResource):
-    """
-    A Blog Post has a *title* and *content*, and can be associated with zero or more comments.
-    """
-    model = BlogPost
-    fields = ('created', 'title', 'slug', 'content', 'url', 'comments')
-    ordering = ('-created',)
-
-    def url(self, instance):
-        return reverse('blog-post',
-                        kwargs={'key': instance.key},
-                        request=self.request)
-
-    def comments(self, instance):
-        return reverse('comments',
-                       kwargs={'blogpost': instance.key},
-                       request=self.request)
-
-
-class CommentResource(ModelResource):
-    """
-    A Comment is associated with a given Blog Post and has a *username* and *comment*, and optionally a *rating*.
-    """
-    model = Comment
-    fields = ('username', 'comment', 'created', 'rating', 'url', 'blogpost')
-    ordering = ('-created',)
-
-    def blogpost(self, instance):
-        return reverse('blog-post',
-                       kwargs={'key': instance.blogpost.key},
-                       request=self.request)