From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 14 Dec 2016 07:32:54 +0000 (-0800)
Subject: merge 2.7.13 release branch
X-Git-Tag: v2.7.14rc1~339
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0644d2629e406eef1a4fe425d519640d7460336d;p=python

merge 2.7.13 release branch
---

0644d2629e406eef1a4fe425d519640d7460336d
diff --cc Misc/NEWS
index 3d0e24e654,bb4c1d9f98..ce0e465527
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,17 -2,16 +2,27 @@@
  Python News
  +++++++++++
  
 +What's New in Python 2.7.14?
 +============================
 +
 +*Release date: XXXX-XX-XX*
 +
 +Core and Builtins
 +-----------------
 +
 +Library
 +-------
 +
+ What's New in Python 2.7.13
+ ===========================
+ 
+ *Release date: 2016-12-XX*
+ 
+ Core and Builtins
+ -----------------
+ 
+ - Revert a37cc3d926ec (Issue #5322).
+ 
  
  What's New in Python 2.7.13 release candidate 1?
  ================================================