Merge branch '1.13' into 1.14

Conflicts: paramiko/__init__.py setup.py
lmroz · Aug 26, 2014 · deea38f · deea38f
2 parents 401b2fc + 1b69e0f
commit deea38f
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
 Changelog
 =========
 
+* :release:`1.13.2 <2014-08-25>`
 * :bug:`376` Be less aggressive about expanding variables in ``ssh_config``
   files, which results in a speedup of SSH config parsing. Credit to Olle
   Lundberg.