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

diff --git a/examples/blogpost/models.py b/examples/blogpost/models.py
deleted file mode 100644
index 10732ab4..00000000
--- a/examples/blogpost/models.py
+++ /dev/null
@@ -1,41 +0,0 @@
-from django.db import models
-from django.template.defaultfilters import slugify
-import uuid
-
-
-def uuid_str():
-    return str(uuid.uuid1())
-
-
-RATING_CHOICES = ((0, 'Awful'),
-                  (1, 'Poor'),
-                  (2, 'OK'),
-                  (3, 'Good'),
-                  (4, 'Excellent'))
-
-MAX_POSTS = 10
-
-
-class BlogPost(models.Model):
-    key = models.CharField(primary_key=True, max_length=64, default=uuid_str, editable=False)
-    title = models.CharField(max_length=128)
-    content = models.TextField()
-    created = models.DateTimeField(auto_now_add=True)
-    slug = models.SlugField(editable=False, default='')
-
-    def save(self, *args, **kwargs):
-        """
-        For the purposes of the sandbox, limit the maximum number of stored models.
-        """
-        self.slug = slugify(self.title)
-        super(self.__class__, self).save(*args, **kwargs)
-        for obj in self.__class__.objects.order_by('-created')[MAX_POSTS:]:
-            obj.delete()
-
-
-class Comment(models.Model):
-    blogpost = models.ForeignKey(BlogPost, editable=False, related_name='comments')
-    username = models.CharField(max_length=128)
-    comment = models.TextField()
-    rating = models.IntegerField(blank=True, null=True, choices=RATING_CHOICES, help_text='How did you rate this post?')
-    created = models.DateTimeField(auto_now_add=True)