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

[matthias.klose]

https://hg.python.org/cpython/rev/a19ce80e9fa3
changeset:   106360:a19ce80e9fa3
branch:      3.6
parent:      106357:b0463c5073fc
parent:      106359:7b279c263708
user:        doko at ubuntu.com
date:        Wed Feb 01 13:01:54 2017 +0100
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
@@ -50,7 +50,7 @@
 Extension Modules
 -----------------
 
-- Issue #29169: Update zlib to 1.2.10.
+- Issue #29169: Update zlib to 1.2.11.
 
 Library
 -------

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