From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 1 Nov 2013 00:23:57 +0000 (-0400)
Subject: merge 2.7.6 release branch
X-Git-Tag: v2.7.8~311
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a40f5b513d80cf84e05337244feaa85b06be6bb6;p=python

merge 2.7.6 release branch
---

a40f5b513d80cf84e05337244feaa85b06be6bb6
diff --cc Misc/NEWS
index f0b7d37038,c353571854..962a7c42ca
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -1,24 -1,6 +1,21 @@@
  Python News
  +++++++++++
  
 +What's New in Python 2.7.7?
 +===========================
 +
 +*Release date: XXXX-XX-XX*
 +
 +Core and Builtins
 +-----------------
 +
 +Library
 +-------
 +
 +Tests
 +-----
 +
- - Issue #19457: Fixed xmlcharrefreplace tests on wide build when tests are
-   loaded from .py[co] files.
- 
 +
  Whats' New in Python 2.7.6?
  ===========================