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

diff --git a/djangorestframework/urls.py b/djangorestframework/urls.py
deleted file mode 100644
index e446c396..00000000
--- a/djangorestframework/urls.py
+++ /dev/null
@@ -1,23 +0,0 @@
-"""
-Login and logout views for the browseable API.
-
-Add these to your root URLconf if you're using the browseable API and
-your API requires authentication.
-
-The urls must be namespaced as 'djangorestframework', and you should make sure
-your authentication settings include `SessionAuthentication`.
-
-    urlpatterns = patterns('',
-        ...
-        url(r'^auth', include('djangorestframework.urls', namespace='djangorestframework'))
-    )
-"""
-from django.conf.urls.defaults import patterns, url
-
-
-template_name = {'template_name': 'djangorestframework/login.html'}
-
-urlpatterns = patterns('django.contrib.auth.views',
-    url(r'^login/$', 'login', template_name, name='login'),
-    url(r'^logout/$', 'logout', template_name, name='logout'),
-)