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

[matthias.klose]

https://hg.python.org/cpython/rev/59e193171472
changeset:   106361:59e193171472
parent:      106358:0e8c13da4f32
parent:      106360:a19ce80e9fa3
user:        doko at ubuntu.com
date:        Wed Feb 01 13:02:16 2017 +0100
summary:
  Merge 3.6

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
@@ -218,7 +218,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