Merge branch '1.14' into 1.15

2 files changed, 5 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index 629c28fd..f9c4b4fe 100644
--- a/setup.py
+++ b/setup.py
@@ -41,8 +41,8 @@ try:
     from setuptools import setup
     kw = {
         'install_requires': [
-            'pycrypto >= 2.1, != 2.4',
-            'ecdsa >= 0.11',
+            'pycrypto>=2.1,!=2.4',
+            'ecdsa>=0.11',
         ],
     }
 except ImportError:
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index b565e0e3..6c772355 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
 Changelog
 =========
 
+* :support:`697` Remove whitespace in our ``setup.py``'s ``install_requires``
+  as it triggers occasional bugs in some versions of ``setuptools``. Thanks to
+  Justin Lecher for catch & original patch.
 * :bug:`499` Strip trailing/leading whitespace from lines when parsing SSH
   config files - this brings things in line with OpenSSH behavior. Thanks to
   Alfredo Esteban for the original report and Nick Pillitteri for the patch.