From ceb39683dc3a5326b090edec855366e4dfe70887 Mon Sep 17 00:00:00 2001
From: Jeff Forcier <jeff@bitprophet.org>
Date: Fri, 27 Sep 2013 21:57:37 -0700
Subject: [PATCH] Clone 1.10.4 items to 1.11.2

---
 NEWS | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/NEWS b/NEWS
index caabc65..1a64beb 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,13 @@ v1.11.2 (27th Sep 2013)
 * #156: Fix potential deadlock condition when using Channel objects as sockets
   (e.g. when using SSH gatewaying). Thanks to Steven Noonan and Frank Arnold
   for catch & patch.
+* #179: Fix a missing variable causing errors when an ssh_config file has a
+  non-default AddressFamily set. Thanks to Ed Marshall & Tomaz Muraus for catch
+  & patch.
+* #200: Fix an exception-causing typo in `demo_simple.py`. Thanks to Alex
+  Buchanan for catch & Dave Foster for patch.
+* #199: Typo fix in the license header cross-project. Thanks to Armin Ronacher
+  for catch & patch.
 
 v1.10.4 (27th Sep 2013)
 -----------------------