tomchristie/django-rest-framework — pull request #312 by markotibold (2012-10-22 18:15:21+00:00)
Title: WIP on #310

Merged manually, to resolve conflicts.