Merge branch '1.13'

This commit is contained in:
Jeff Forcier 2014-03-22 18:26:18 -07:00
commit a495da760f
1 changed files with 3 additions and 2 deletions

View File

@ -2,8 +2,9 @@
Changelog Changelog
========= =========
* :support:`290` Add a ``setup.cfg`` marking Paramiko as 'universal' when * :support:`290` (also :issue:`292`) Add support for building universal
generating wheel files. Courtesy of Alex Gaynor. (Python 2+3 compatible) wheel files during the release process. Courtesy of
Alex Gaynor.
* :support:`284` Add Python language trove identifiers to ``setup.py``. Thanks * :support:`284` Add Python language trove identifiers to ``setup.py``. Thanks
to Alex Gaynor for catch & patch. to Alex Gaynor for catch & patch.
* :bug:`235` Improve string type testing in a handful of spots (e.g. ``s/if * :bug:`235` Improve string type testing in a handful of spots (e.g. ``s/if