Merge migrations

src/pretix/base/migrations/0013_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 = [
+        ('pretixbase', '0011_remove_event_max_items_per_order'),
+        ('pretixbase', '0012_auto_20150304_1038'),
+    ]
+
+    operations = [
+    ]