Merge pull request #21 from edx/jeskew/fix_model_deprecation_warning_3

Remove Django deprecation message.

setup.py

@@ -16,8 +16,8 @@ def build_media_pattern(base_folder, file_extension):
 template_patterns = ( build_media_pattern("templates", "html") +
                       build_media_pattern("static", "js") +
                       build_media_pattern("static", "css") +
-                      build_media_pattern("static", "png") + 
-                      build_media_pattern("static", "jpeg") + 
+                      build_media_pattern("static", "png") +
+                      build_media_pattern("static", "jpeg") +
                       build_media_pattern("static", "gif"))
 
 packages = find_packages()
@@ -29,7 +29,7 @@ package_data = dict(
 
 setup(
     name = "django-wiki",
-    version = "0.0.6",
+    version = "0.0.8",
     author = "Benjamin Bach",
     author_email = "benjamin@overtag.dk",
     description = ("A wiki system written for the Django framework."),

wiki/migrations/0003_ip_address_conv.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wiki', '0002_remove_article_subscription'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='articlerevision',
+            name='ip_address',
+            field=models.GenericIPAddressField(verbose_name='IP address', null=True, editable=False, blank=True),
+        ),
+        migrations.AlterField(
+            model_name='attachmentrevision',
+            name='ip_address',
+            field=models.GenericIPAddressField(verbose_name='IP address', null=True, editable=False, blank=True),
+        ),
+        migrations.AlterField(
+            model_name='revisionpluginrevision',
+            name='ip_address',
+            field=models.GenericIPAddressField(verbose_name='IP address', null=True, editable=False, blank=True),
+        ),
+    ]