Patch #1349118: urllib2 now supports user:pass@ style proxy
specifications, raises IOErrors when proxies for unsupported protocols
are defined, and uses the https proxy on https redirections.
diff --git a/Misc/ACKS b/Misc/ACKS
index 0eb0721..b005b36 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -427,6 +427,7 @@
 Chad Netzer
 Max Neunhöffer
 George Neville-Neil
+Johannes Nicolai
 Samuel Nicolary
 Gustavo Niemeyer
 Oscar Nierstrasz
diff --git a/Misc/NEWS b/Misc/NEWS
index af41f33..e74b4c6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -337,6 +337,10 @@
 Library
 -------
 
+- Patch #1349118: urllib2 now supports user:pass@ style proxy 
+  specifications, raises IOErrors when proxies for unsupported protocols
+  are defined, and uses the https proxy on https redirections.
+
 - Bug #902075: urllib2 now supports 'host:port' style proxy specifications.
 
 - Bug #1407902: Add support for sftp:// URIs to urlparse.