Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2