d0ugal/django-rest-framework — pull request #4 by jpadilla (2014-11-05 13:39:36+00:00)
Title: Merged upstream/master

Just merged latest upstream/master and resolved two conflicts. Does this work or do we want to rebase instead?