From 941814e1efaf9a46992476e50badcecbcbfc9a41 Mon Sep 17 00:00:00 2001
From: "Jeremy T. Bouse" <jbouse@debian.org>
Date: Mon, 22 Sep 2014 20:57:20 -0400
Subject: Imported Upstream version 1.15.1

---
 sites/docs/api/keys.rst | 17 +++++++++++++++++
 sites/www/changelog.rst |  5 +++++
 2 files changed, 22 insertions(+)

(limited to 'sites')

diff --git a/sites/docs/api/keys.rst b/sites/docs/api/keys.rst
index af7b58c..c6412f7 100644
--- a/sites/docs/api/keys.rst
+++ b/sites/docs/api/keys.rst
@@ -1,6 +1,23 @@
+============
 Key handling
 ============
 
+Parent key class
+================
+
 .. automodule:: paramiko.pkey
+
+DSA (DSS)
+=========
+
 .. automodule:: paramiko.dsskey
+
+RSA
+===
+
 .. automodule:: paramiko.rsakey
+
+ECDSA
+=====
+
+.. automodule:: paramiko.ecdsakey
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index d0bd481..3e654f6 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,11 @@
 Changelog
 =========
 
+* :release:`1.15.1 <2014-09-22>`
+* :bug:`399` SSH agent forwarding (potentially other functionality as
+  well) would hang due to incorrect values passed into the new window size
+  arguments for `.Transport` (thanks to a botched merge). This has been
+  corrected. Thanks to Dylan Thacker-Smith for the report & patch.
 * :release:`1.15.0 <2014-09-18>`
 * :support:`393` Replace internal use of PyCrypto's ``SHA.new`` with the
   stdlib's ``hashlib.sha1``. Thanks to Alex Gaynor.
-- 
cgit v1.2.3