Merge branch '1.13' into 1.14

2 files changed, 4 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index 9e08323d..9fa13d15 100644
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@ try:
     from setuptools import setup
     kw = {
         'install_requires': [
-            'pycrypto >= 2.1, != 2.4',
+            'pycrypto>=2.1,!=2.4',
             'ecdsa',
         ],
     }
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index bad37089..be493f02 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.