Merge branch '1.11' into 1.12

This commit is contained in:
Jeff Forcier 2014-03-22 18:24:37 -07:00
commit 4d76a90985
2 changed files with 0 additions and 4 deletions

View File

@ -1,2 +0,0 @@
[wheel]
universal = 1

View File

@ -2,8 +2,6 @@
Changelog Changelog
========= =========
* :support:`290` Add a ``setup.cfg`` marking Paramiko as 'universal' when
generating wheel files. 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