From b54d4652a3c90fe622c504b4f42260120d2b6f9d Mon Sep 17 00:00:00 2001
From: Carl Meyer <carl@oddbird.net>
Date: Wed, 29 Oct 2014 16:20:02 -0600
Subject: [PATCH] Update AUTHORS/changelog.

---
 AUTHORS.rst | 1 +
 CHANGES.rst | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 2a26eeb..c4a9367 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -1,3 +1,4 @@
+ad-m <github.com/ad-m>
 Alejandro Varas <alej0varas@gmail.com>
 Alex Orange <crazycasta@gmail.com>
 Andy Freeland <andy@andyfreeland.net>
diff --git a/CHANGES.rst b/CHANGES.rst
index efdde71..b0f75bd 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -9,6 +9,9 @@ master (unreleased)
   instances of a model from the same queryset. Thanks Bram Boogaard. Merge of
   GH-151.
 
+* Fix Django 1.7 migrations compatibility for SplitField. Thanks ad-m. Merge of
+  GH-157; fixes GH-156.
+
 
 2.2 (2014.07.31)
 ----------------