Merge branch '2.1.x'

* 2.1.x:
  Bump version to 2.1.2a1.
  Bump version to 2.1.1.
  ASCII-fold changelog, again. Fixes GH-141.
  Bump version to 2.1.1a.

Conflicts:
	CHANGES.rst
	model_utils/__init__.py
This commit is contained in:
Carl Meyer 2014-07-28 10:03:53 -06:00
commit 2b1c7e3757

View file

@ -4,6 +4,9 @@ CHANGES
master (unreleased)
-------------------
2.1.1 (2014.07.28)
------------------
* 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