From: Gregory P. Smith <greg@krypto.org>
Date: Tue, 19 Mar 2013 22:33:23 +0000 (-0700)
Subject: merge heads & use iso8601 date format
X-Git-Tag: v3.4.0a1~1153
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=110f25d53df2cbf03a2c5299994986cc84c25db8;p=python

merge heads & use iso8601 date format
---

110f25d53df2cbf03a2c5299994986cc84c25db8
diff --cc Misc/NEWS
index c82f7b6970,1377e5964d..31c3b41447
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,10 -2,12 +2,10 @@@
  Python News
  +++++++++++
  
 -What's New in Python 3.3.1?
 -===========================
 -
 -*Not yet released, see sections below for changes released in 3.3.0*
 +What's New in Python 3.4.0 Alpha 1?
 +===================================
  
- *Relase date: XX-XXX-2014*
 -.. *Release date: 2013-XX-XX*
++*Relase date: 2014-XX-XX*
  
  Core and Builtins
  -----------------