# HG changeset patch
# User Jeff Forcier <jeff@bitprophet.org>
# Date 1380344257 25200
#      Fri Sep 27 21:57:37 2013 -0700
# Node ID 64e0aa7329b00f273099f18e61d78c36116fe34d
# Parent  477fcae54622e2fdd842cf0f1e620e84260e09dc
Clone 1.10.4 items to 1.11.2

diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,13 @@
 * #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)
 -----------------------