[Python-checkins] cpython (merge 3.5 -> default): merge 3.5

[benjamin.peterson]

https://hg.python.org/cpython/rev/d1074a1324ef
changeset:   96691:d1074a1324ef
parent:      96687:5c725bf42721
parent:      96690:bb8959d0540c
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Jun 27 14:26:29 2015 -0500
summary:
  merge 3.5

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


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -463,7 +463,7 @@
   lines from the code object, fixing an issue when a lambda function is used as
   decorator argument. Patch by Thomas Ballinger and Allison Kaptur.
 
-- Fix possible integer overflows in the pickle module.
+- Issue #24521: Fix possible integer overflows in the pickle module.
 
 - Issue #22931: Allow '[' and ']' in cookie values.
 

-- 
Repository URL: https://hg.python.org/cpython