HOT-FIX: faz o merge de migration do protocoloadm

protocoloadm/migrations/0013_merge.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-05-19 17:03
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('protocoloadm', '0012_tipoinstituicao'),
+        ('protocoloadm', '0012_auto_20160503_0926'),
+    ]
+
+    operations = [
+    ]