summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-03-22 18:02:28 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-03-22 18:02:28 -0700
commitd4e98d8d77dd34ccd6e14a9febf8b26439f5c350 (patch)
treec11dedf1f6ffc2edbdca833e7ad61c9c0d6522b1
parentc5fff0c3992d4b0ac05e380ac233ce93cccb13d4 (diff)
parent270dacaf33279bed2ae599d718183cec541e032d (diff)
Merge branch '1.11' into 1.12
-rw-r--r--sites/www/changelog.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index acf20c59..88caba6c 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
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
to Alex Gaynor for catch & patch.
* :bug:`235` Improve string type testing in a handful of spots (e.g. ``s/if