Fix Mixin class name in viewsets docs example
Merge pull request #983 from yprez/fix_doc_class_names

Fix Mixin class name in viewsets docs example
Added test case classes
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Docs fix
Only include APISimpleTestCase and APILiveServerTestCase from django 1.4 onwards
pedantic doc updates
Merge pull request #991 from ericbuehl/master

pedantic doc updates
Modified documentation for CSRF as mentioned in #984
Merge pull request #993 from kevin-brown/issue_984_docs

Made the CSRF documentation more clear
Updated EmailField error message. This one already available in django translations.

https://github.com/django/django/blob/master/django/conf/locale/ru/LC_MESSAGES/django.po#L343
Fixed test
added script block to list of blocks

Phew, was afraid I wouldn't be able to overwrite this section..
Merge pull request #996 from speg/patch-1

added script block to list of blocks
Merge pull request #995 from pzinovkin/patch-1

Updated EmailField error message.
Add @pzinovkin for #995 thanks!
Fix *Throttle class names in the docs

* AnonThrottle -> AnonRateThrottle
* UserThrottle -> UserRateThrottle
* ScopedThrottle -> ScopedRateThrottle
* (cosmetic) removed one errant whitespace character

Fixes #1006.
Merge pull request #1007 from willkg/throttle-docs-fix-1006

Fix *Throttle class names in the docs
Add @willkg for #1007 thanks!
Fixed reversed arguments in assertion