Merge branch '1.11' into 1.12

This commit is contained in:
Jeff Forcier 2014-03-21 11:23:06 -07:00
commit 3780c0314c
1 changed files with 2 additions and 0 deletions

View File

@ -2,6 +2,8 @@
Changelog
=========
* :support:`284` Add Python language trove identifiers to ``setup.py``. Thanks
to Alex Gaynor for catch & patch.
* :bug:`235` Improve string type testing in a handful of spots (e.g. ``s/if
type(x) is str/if isinstance(x, basestring)/g``.) Thanks to ``@ksamuel`` for
the report.