Merge pull request #1 from tomchristie/master

Update from main
Merge pull request #2 from tomchristie/master

Update to latest
Merge pull request #3 from tomchristie/master

Update to latest
First hacky pass at displaying raw data
Throttles now use HTTP_X_FORWARDED_FOR, falling back to REMOTE_ADDR to identify anonymous requests
Simplifying raw data renderering support
Add composed-permissions entry to the api-guide.
add transform_<fieldname> methods to serializers, which basically do the opposite of validate_<fieldname> on a per-field basis.
Merge pull request #1070 from niwibe/docs/add-composed-permissions-entry

Add composed-permissions entry to the api-guide.
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Added @niwibe

For docs addition #1070 - Thanks!
Add `override_method` context manager and cleanup.
minor sp
Merge pull request #1073 from asparagui/minor_sp_generic_views

minor sp
Make ChoiceField.from_native() follow IntegerField behaviour on empty values
Merge pull request #1074 from diox/choicefield-empty-value

Make ChoiceField.from_native() follow IntegerField behaviour on empty values
Include serialized content in raw data form.
Added @diox for fix #1074.  Thanks!
Update release notes.
Added note on botbot IRC archives