From baa1b05eb7824f5b151f4056a7edaa709ff6bd3b Mon Sep 17 00:00:00 2001
From: Carlos de la Guardia <cguardia@yahoo.com>
Date: Thu, 5 Mar 2015 22:34:29 -0600
Subject: [PATCH 1/2] Add empty introspection rule fro BlockTypeKeyField.

From 0.7 on, South requires explicit introspection rules. Previously, it used the parser module to introspect.
---
 common/djangoapps/xmodule_django/models.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/djangoapps/xmodule_django/models.py b/common/djangoapps/xmodule_django/models.py
index 0be207e8a6..8a3046c33b 100644
--- a/common/djangoapps/xmodule_django/models.py
+++ b/common/djangoapps/xmodule_django/models.py
@@ -179,3 +179,4 @@ class BlockTypeKeyField(OpaqueKeyField):
 add_introspection_rules([], [r"^xmodule_django\.models\.CourseKeyField"])
 add_introspection_rules([], [r"^xmodule_django\.models\.LocationKeyField"])
 add_introspection_rules([], [r"^xmodule_django\.models\.UsageKeyField"])
+add_introspection_rules([], [r"^xmodule_django\.models\.BlockTypeKeyField"])

From c04e76e62ab6c326f30bd30b9b6f6b24ee491831 Mon Sep 17 00:00:00 2001
From: Carlos de la Guardia <cguardia@yahoo.com>
Date: Fri, 6 Mar 2015 00:45:00 -0600
Subject: [PATCH 2/2] Update AUTHORS

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 37752d3404..e320ef220f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -199,3 +199,4 @@ Mat Moore <mat@mooresoftware.co.uk>
 Muzaffar Yousaf <muzaffar@edx.org>
 Sylvain <sylvain@openfun.fr>
 Mayank Jain <mjmayank@gmail.com>
+Carlos de la Guardia <cguardia@yahoo.com>