Update Typo
Merge pull request #876 from atarzwell/master

Incorrect import in Tutorial - Step 6 - ViewSets
Added @atarzwell for docs fix #876. Thanks!
Merge and styling fixes
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Note usage of django-filter 0.5.4 for Django 1.3 support. Closes #877
Added @mikee2185 and @mjtorn for their work on #467.  Thank you :)
Tweak nav style slightly
Tweak method ordering for better consistency
Minor cleanup
Security email address
Use assertEqual, not assertEquals
Last bits of charset sorting-out-ness
Fix release notes
simplified, moved field humanizing to Field. broken tests
Updating docs
Merge branch 'issue-192-expose-fields-for-options' of https://github.com/grimborg/django-rest-framework into improved-options-support
Allow action decorator to handle multiple http methods
Clean up OPTIONS implementation
Version 2.3.4