Merge branch '1.12' into 1.13

Conflicts: paramiko/__init__.py setup.py sites/www/changelog.rst
dylanahsmith · May 7, 2014 · c7f6744 · c7f6744
2 parents 5837b7c + 09e9d48
commit c7f6744
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
@@ -2,6 +2,8 @@
 Changelog
 =========
 
+* :release:`1.12.4 <2014-05-07>`
+* :release:`1.11.6 <2014-05-07>`
 * :bug:`-` `paramiko.file.BufferedFile.read` incorrectly returned text strings
   after the Python 3 migration, despite bytes being more appropriate for file
   contents (which may be binary or of an unknown encoding.) This has been