summaryrefslogtreecommitdiffhomepage
path: root/sites
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-05-07 14:10:07 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-05-07 14:10:07 -0700
commitc7f67445f7003a9705b171396c473ef8c05bb054 (patch)
tree7bc70320cb9296c531d12efcff6558ac5ed3106b /sites
parent5837b7c21a10b4c0664412cae1f9604580ba5934 (diff)
parent09e9d48db06b7e6eff090dc2cbbb94fef18a1b2c (diff)
Merge branch '1.12' into 1.13
Conflicts: paramiko/__init__.py setup.py sites/www/changelog.rst
Diffstat (limited to 'sites')
-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 8a4b0f56..fbb3270f 100644
--- 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