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

Conflicts:
	docs/api-guide/authentication.md
	docs/topics/credits.md

docs/topics/credits.md

@@ -157,4 +157,3 @@ To contact the author directly:
 [glic3rinu]: https://github.com/glic3rinu
 [ludwigkraatz]: https://github.com/ludwigkraatz
 [robromano]: https://github.com/robromano
-