merge 2.7.11 release branch

b37d9b46 · Benjamin Peterson · 37c02acb · 5323ed34 · b37d9b46
Commit b37d9b46 authored Nov 22, 2015 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

Misc/NEWS Misc/NEWS +3 -0

No files found.
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,9 @@ Core and Builtins
 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?
 ================================================