From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Feb 2015 02:01:43 +0000 (-0500)
Subject: merge 3.4 (#23366)
X-Git-Tag: v3.5.0a1~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4db56d5002e536bf37ed2a3fa32d899d873bde77;p=python

merge 3.4 (#23366)
---

4db56d5002e536bf37ed2a3fa32d899d873bde77
diff --cc Misc/NEWS
index 40c0f015c3,bf05c2b8d8..27c0f02bc7
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -226,9 -50,8 +226,11 @@@ 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 #23369: Fixed possible integer overflow in
    _json.encode_basestring_ascii.