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, 5 insertions, 11 deletions

diff --git a/.gitignore b/.gitignore
index 40c68bd5..96186b46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,17 +3,11 @@
 *~
 .*
 
-coverage.xml
-env
-docs/build
-html
-htmlcov
-examples/media/pygments/[A-Za-z0-9]*
-examples/media/objectstore/[A-Za-z0-9]*
-build/*
-dist/*
-xmlrunner/*
-djangorestframework.egg-info/*
+html/
+coverage/
+build/
+dist/
+rest_framework.egg-info/
 MANIFEST
 
 !.gitignore