Merge branch 'restframework2' of git://github.com/tomchristie/django-rest-framework into improved-view-decorators

* 'restframework2' of git://github.com/tomchristie/django-rest-framework: (56 commits)
  Bits of cleanup
  Add request.QUERY_PARAMS
  Add readonly 'id' field
  Tweak browseable API
  Don't display readonly fields
  Fix some bits of serialization
  Add csrf note
  Fix incorrect bit of tutorial
  Added tox.ini
  Tweak media_type -> accepted_media_type.  Need to document, but marginally less confusing
  Tweak media_type -> accepted_media_type.  Need to document, but marginally less confusing
  Tweak media_type -> accepted_media_type.  Need to document, but marginally less confusing
  Clean up bits of templates etc
  Hack out bunch of unneccesary private methods on View class
  Clean up template tags
  Remove dumbass __all__ variables
  Remove old 'djangorestframework directories
  Change package name: djangorestframework -> rest_framework
  Dont strip final '/'
  Use get_script_prefix to play nicely if not installed at the root.
  ...

Conflicts:
	rest_framework/decorators.py

1 files changed, 0 insertions, 28 deletions

diff --git a/djangorestframework/tests/models.py b/djangorestframework/tests/models.py
deleted file mode 100644
index 4cae68b6..00000000
--- a/djangorestframework/tests/models.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from django.db import models
-from django.contrib.auth.models import Group
-
-class CustomUser(models.Model):
-    """
-    A custom user model, which uses a 'through' table for the foreign key
-    """
-    username = models.CharField(max_length=255, unique=True)
-    groups = models.ManyToManyField(
-        to=Group, blank=True, null=True, through='UserGroupMap'
-    )
-
-    @models.permalink
-    def get_absolute_url(self):
-        return ('custom_user', (), {
-            'pk': self.id
-    })
-
-
-class UserGroupMap(models.Model):
-    user = models.ForeignKey(to=CustomUser)
-    group = models.ForeignKey(to=Group)      
-    
-    @models.permalink
-    def get_absolute_url(self):
-        return ('user_group_map', (), {
-            'pk': self.id
-        })