Merge from 3.4.

larryhastings · larryhastings · commit 2f710b60084c · 2015-02-27T09:21:06.000-08:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -345,8 +345,6 @@ Library
 
 - Issue #23366: Fixed possible integer overflow in itertools.combinations.
 
-- Issue #23366: Fixed possible integer overflow in itertools.combinations.
-
 - Issue #23369: Fixed possible integer overflow in
   _json.encode_basestring_ascii.
 
@@ -376,7 +374,7 @@ Library
   __ne__() now works correctly.
 
 - Issue #19996: :class:`email.feedparser.FeedParser` now handles (malformed)
-  headers with no key rather than amusing the body has started.
+  headers with no key rather than assuming the body has started.
 
 - Issue #20188: Support Application-Layer Protocol Negotiation (ALPN) in the ssl
   module.
