merge parallel migrations in tests

wagtail/tests/migrations/0005_auto_20141113_0642.py

@@ -7,6 +7,7 @@ from django.db import models, migrations
 class Migration(migrations.Migration):
 
     dependencies = [
+        ('wagtailcore', '0002_initial_data'),
         ('tests', '0004_auto_20141008_0420'),
     ]
 

wagtail/tests/migrations/0006_merge.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tests', '0005_auto_20141113_0642'),
+        ('tests', '0005_auto_20141008_0122'),
+    ]
+
+    operations = [
+    ]