From 4ed7eb05e59d34838081e2ca19aae5c3a9fcc127 Mon Sep 17 00:00:00 2001
From: Carl Meyer <carl@oddbird.net>
Date: Mon, 28 Jul 2014 09:59:23 -0600
Subject: [PATCH 1/4] Bump version to 2.1.1a.

---
 CHANGES.rst             | 3 +++
 model_utils/__init__.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 5c605b8..cb0466c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,9 @@
 CHANGES
 =======
 
+2.1.x (unreleased)
+------------------
+
 2.1.0 (2014.07.25)
 ------------------
 
diff --git a/model_utils/__init__.py b/model_utils/__init__.py
index 9d81bc8..23c8b70 100644
--- a/model_utils/__init__.py
+++ b/model_utils/__init__.py
@@ -1,4 +1,4 @@
 from .choices import Choices
 from .tracker import FieldTracker, ModelTracker
 
-__version__ = '2.1.0'
+__version__ = '2.1.1a'

From abd47ed4069f9360696205991f3f4fbbab4341ba Mon Sep 17 00:00:00 2001
From: Carl Meyer <carl@oddbird.net>
Date: Mon, 28 Jul 2014 09:55:18 -0600
Subject: [PATCH 2/4] ASCII-fold changelog, again. Fixes GH-141.

---
 CHANGES.rst | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index cb0466c..561efde 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,13 @@ CHANGES
 2.1.x (unreleased)
 ------------------
 
+* ASCII-fold all non-ASCII characters in changelog; again. Argh. Apologies to
+  those whose names are mangled by this change. It seems that distutils makes
+  it impossible to handle non-ASCII content reliably under Python 3 in a
+  setup.py long_description, when the system encoding may be ASCII. Thanks
+  Brian May for the report. Fixes GH-141.
+
+
 2.1.0 (2014.07.25)
 ------------------
 
@@ -14,7 +21,7 @@ CHANGES
   ``dir``, allowing `IPython`_ tab completion to be useful. Merge of GH-104,
   fixes GH-55.
 
-* Add pickle support for models using ``FieldTracker``.  Thanks Ondrej Slinták
+* Add pickle support for models using ``FieldTracker``.  Thanks Ondrej Slintak
   for the report.  Thanks Matthew Schinckel for the fix.  Merge of GH-130,
   fixes GH-83.
 

From bd3787a4a8a6d4b4dd1593b185f475b5d2b52126 Mon Sep 17 00:00:00 2001
From: Carl Meyer <carl@oddbird.net>
Date: Mon, 28 Jul 2014 10:00:40 -0600
Subject: [PATCH 3/4] Bump version to 2.1.1.

---
 CHANGES.rst             | 2 +-
 model_utils/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 561efde..a8ad9f5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,7 +1,7 @@
 CHANGES
 =======
 
-2.1.x (unreleased)
+2.1.1 (2014.07.28)
 ------------------
 
 * ASCII-fold all non-ASCII characters in changelog; again. Argh. Apologies to
diff --git a/model_utils/__init__.py b/model_utils/__init__.py
index 23c8b70..38ac8b1 100644
--- a/model_utils/__init__.py
+++ b/model_utils/__init__.py
@@ -1,4 +1,4 @@
 from .choices import Choices
 from .tracker import FieldTracker, ModelTracker
 
-__version__ = '2.1.1a'
+__version__ = '2.1.1'

From 19c9c380df1335942277b2939ea7e7ae7bd743ed Mon Sep 17 00:00:00 2001
From: Carl Meyer <carl@oddbird.net>
Date: Mon, 28 Jul 2014 10:02:39 -0600
Subject: [PATCH 4/4] Bump version to 2.1.2a1.

---
 CHANGES.rst             | 3 +++
 model_utils/__init__.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index a8ad9f5..c5c7746 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,9 @@
 CHANGES
 =======
 
+2.1.2a1 (unreleased)
+--------------------
+
 2.1.1 (2014.07.28)
 ------------------
 
diff --git a/model_utils/__init__.py b/model_utils/__init__.py
index 38ac8b1..95362ce 100644
--- a/model_utils/__init__.py
+++ b/model_utils/__init__.py
@@ -1,4 +1,4 @@
 from .choices import Choices
 from .tracker import FieldTracker, ModelTracker
 
-__version__ = '2.1.1'
+__version__ = '2.1.2a1'