Merge pull request #2 from javiercf/master

Update admin.py compatibility with Django 1.6, maintaining backwards compatibility

Author: defbyte

singleton_models/admin.py

@@ -18,7 +18,10 @@ def has_delete_permission(self, request, obj=None):
         return False
 
     def get_urls(self):
-        from django.conf.urls.defaults import patterns, url
+        try:
+            from django.conf.urls.defaults import patterns, url
+        except ImportError:
+            from django.conf.urls import patterns, url
 
         def wrap(view):
             def wrapper(*args, **kwargs):