Merge branch 'master' of github.com:derek-schaefer/django-json-field

Author: derek-schaefer

json_field/fields.py

@@ -168,6 +168,15 @@ def set_json(model_instance, value):
 try:
     # add support for South migrations
     from south.modelsinspector import add_introspection_rules
-    add_introspection_rules([], ['^json_field\.fields\.JSONField'])
+    rules = [
+        (
+            (JSONField,),
+            [],
+            {
+                'db_type': ['_db_type', {'default': None}]
+            }
+        )
+    ]
+    add_introspection_rules(rules, ['^json_field\.fields\.JSONField'])
 except ImportError:
     pass