summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-03-22 18:02:29 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-03-22 18:02:29 -0700
commit7a3eedcee2ed54646665b030e08f94b69cc3e642 (patch)
tree4f9a9541b3a9bc93ef972f2a3e31bd361d023efc
parent3003eaacd871e7b7d8f4972fe5cbec057200048b (diff)
parent50598d35a1642346443bf9078cd511ed732dcf41 (diff)
Merge branch '1.13'
-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 a3558111..ade79cc5 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