[Python-checkins] cpython (merge 2.7 -> 2.7): merge 2.7.11 release branch

[benjamin.peterson]

https://hg.python.org/cpython/rev/d452cf840e5b
changeset:   99293:d452cf840e5b
branch:      2.7
parent:      99287:de5582c569ff
parent:      99292:43208b0f2535
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Nov 22 19:05:14 2015 -0800
summary:
  merge 2.7.11 release branch

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


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,9 @@
 Library
 -------
 
+- Issue #25624: ZipFile now always writes a ZIP_STORED header for directory
+  entries.  Patch by Dingyuan Wang.
+
 
 What's New in Python 2.7.11 release candidate 1?
 ================================================

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