Merge branch 'master' of git.neuf.no:dusken

dusken/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 from django.conf.urls import patterns, include, url
 from django.contrib import admin
 from tastypie.api import Api
@@ -6,8 +6,6 @@ from tastypie.api import Api
 from dusken.api.member import MemberResource
 from dusken.api.membership import MembershipResource
 from dusken.api.group import GroupResource
-from dusken.api.groupsbymember import GroupsByMemberResource
-from dusken.api.membersbygroup import MembersByGroupResource
 from dusken.api.institution import InstitutionResource
 
 admin.autodiscover()
@@ -16,8 +14,6 @@ v1_api = Api(api_name='v1')
 v1_api.register(MemberResource())
 v1_api.register(MembershipResource())
 v1_api.register(GroupResource())
-v1_api.register(GroupsByMemberResource())
-v1_api.register(MembersByGroupResource())
 v1_api.register(InstitutionResource())
 
 urlpatterns = patterns('',