From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Feb 2015 02:11:54 +0000 (-0500)
Subject: merge 3.4 (#23365)
X-Git-Tag: v3.5.0a1~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=38d9772622fa13f7dc1033cd29bad1b15a31c8b4;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#23365)
---

38d9772622fa13f7dc1033cd29bad1b15a31c8b4
diff --cc Misc/NEWS
index 27c0f02bc764,0972950be21e..26db7202c03f
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -226,11 -50,10 +226,13 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #23326: Removed __ne__ implementations.  Since fixing default __ne__
 +  implementation in issue #21408 they are redundant.
 +
  - 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.