Merge branch 'master' into sideload-resources

Conflicts:
	example/api/urls.py

Author: gaker

Diff for: example/api/api.py

@@ -73,7 +73,7 @@ class EmberUserModelViewSet(viewsets.ModelViewSet):
     parser_classes = (parsers.EmberJSONParser, )
 
 
-class EmberDataMixinUserModelViewSet(mixins.MultipleIDMixin,
+class MultipleIDMixinUserModelViewSet(mixins.MultipleIDMixin,
                                      EmberUserModelViewSet):
 
     queryset = auth_models.User.objects.all()

Diff for: example/api/urls.py

@@ -3,7 +3,7 @@
 """
 from django.conf.urls import patterns, include, url
 from .api import (
-    User, UserEmber, EmberUserModelViewSet, EmberDataMixinUserModelViewSet,
+    User, UserEmber, EmberUserModelViewSet, MultipleIDMixinUserModelViewSet,
     UserCarResource)
 
 from rest_framework import routers
@@ -12,7 +12,7 @@
     url(r'^user-default/(?P<pk>\d+)/$', User.as_view(), name='user-default'),
     url(r'^user-ember/(?P<pk>\d+)/$', UserEmber.as_view(), name='user-ember'),
     url(r'^user-mixin-viewset/$',
-        EmberDataMixinUserModelViewSet.as_view({'get': 'list'}),
+        MultipleIDMixinUserModelViewSet.as_view({'get': 'list'}),
         name='mixin-user-list'),
     url(r'^user-viewset/$', EmberUserModelViewSet.as_view({'get': 'list'}),
         name='user-list'),