Merge branch 'master' of https://github.com/tomchristie/django-rest-framework

Conflicts:
	djangorestframework/views.py

Signed-off-by: Jens Alm <jens.alm@mac.com>

AUTHORS

@@ -10,6 +10,7 @@ Michael Fötsch <mfoetsch> - File format support.
 David Larlet <david> - OAuth support.
 Andrew Straw <astraw> - Bugfixes.
 <zeth> - Bugfixes.
+<fzunino> - Bugfixes.
 
 THANKS TO: