Merge pull request #99 from shomodj/master

fixed problems with django 1.6

ckeditor/urls.py

@@ -1,4 +1,10 @@
-from django.conf.urls.defaults import patterns, url
+from django import VERSION
+django_version = VERSION[0]*100 + VERSION[1]
+
+if django_version < 106:
+    from django.conf.urls.defaults import patterns, url
+else:
+    from django.conf.urls import patterns, url    
 
 urlpatterns = patterns(
     '',

setup.py

@@ -9,7 +9,7 @@ def get_source_files():
 
 setup(
     name='django-ckeditor',
-    version='4.0.2',
+    version='4.0.3',
     description='Django admin CKEditor integration.',
     long_description=open('README.rst', 'r').read() + open('AUTHORS.rst', 'r').read() + open('CHANGELOG.rst', 'r').read(),
     author='Shaun Sephton',