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

diff --git a/examples/urls.py b/examples/urls.py
deleted file mode 100644
index fda7942f..00000000
--- a/examples/urls.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from django.conf.urls.defaults import patterns, include, url
-from sandbox.views import Sandbox
-try:
-    from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-except ImportError:  # Django <= 1.2
-    from staticfiles.urls import staticfiles_urlpatterns
-
-
-urlpatterns = patterns('',
-    (r'^$', Sandbox.as_view()),
-    (r'^resource-example/', include('resourceexample.urls')),
-    (r'^model-resource-example/', include('modelresourceexample.urls')),
-    (r'^mixin/', include('mixin.urls')),
-    (r'^object-store/', include('objectstore.urls')),
-    (r'^pygments/', include('pygments_api.urls')),
-    (r'^blog-post/', include('blogpost.urls')),
-    (r'^permissions-example/', include('permissionsexample.urls')),
-    url(r'^restframework/', include('djangorestframework.urls', namespace='djangorestframework')),
-)
-
-urlpatterns += staticfiles_urlpatterns()