Merge migrations with master

coin/members/migrations/0014_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 = [
+        ('members', '0011_member_comments'),
+        ('members', '0013_auto_20141103_2353'),
+    ]
+
+    operations = [
+    ]