[Python-checkins] cpython (2.7): Fix badly merged NEWS item.

[zach.ware]

https://hg.python.org/cpython/rev/a0cd9f1f574a
changeset: 93105:a0cd9f1f574a
branch: 2.7
user: Zachary Ware <zachary.ware at gmail.com>
date: Fri Oct 17 11:09:13 2014 -0500
summary:
Fix badly merged NEWS item.

files:
Misc/NEWS | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -37,6 +37,9 @@
Library
-------

+- Issue #20421: Add a .version() method to SSL sockets exposing the actual
+ protocol version in use.
+
- Issue #22435: Fix a file descriptor leak when SocketServer bind fails.

- Issue #13664: GzipFile now supports non-ascii Unicode filenames.
@@ -283,7 +286,7 @@
-------

- Issue #22160: The bundled version of OpenSSL has been updated to 1.0.1i.
-version in use.
+


What's New in Python 2.7.8?