Merge branch 'master' of https://github.com/woakas/django-rest-framework
Serializer field 'default' argument may be a callable
Upgraded the django-oauth2-provider.
Add notes on 'method' argument to '@action' decorator
Added @aburgel for work on #887. Thank you :)
Only use test import munging prior to Django 1.6's new test runner
Merge pull request #895 from linovia/django1.6a1

Added Django 1.6a1 to the test matrix.
Add Django 1.6 to docs and to tox
Merge pull request #900 from copitux/fix-validation-layer

Bugfix: Fix run validation layer with invalid data
Added @copitux for work on #900. Thanks! :)
request.user should be still be accessible in renderer context if authentication fails
Version 2.3.5
Merge pull request #904 from menghan/fix-doc-typo

fix doc typo
Regression test for #840. Closes #840.
Test cases and fix for plain-list relationships (ie not queryset) Closes #878.
Fix ModelField docs.  Closes #909.
Added trailing_slash argument to routers.  Closes #905
Fix on documentation - wrong reference at previous created view UserList / UserDetail
Fix up tests and tox
Merge master