Merge branch 'restframework2' of…

Merge branch 'restframework2' of git://github.com/tomchristie/django-rest-framework into improved-view-decorators

* 'restframework2' of git://github.com/tomchristie/django-rest-framework:
  Add missing comma

rest_framework/settings.py

@@ -28,7 +28,7 @@ DEFAULTS = {
     ),
     'DEFAULT_PARSERS': (
         'rest_framework.parsers.JSONParser',
-        'rest_framework.parsers.FormParser'
+        'rest_framework.parsers.FormParser',
         'rest_framework.parsers.MultiPartParser'
     ),
     'DEFAULT_AUTHENTICATION': (