From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 1 Jan 2013 03:37:30 +0000 (-0600)
Subject: merge 3.3
X-Git-Tag: v3.4.0a1~1728
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae2039e62cba23d9a5608c0da3f6ee2a7fe8ad09;p=python

merge 3.3
---

ae2039e62cba23d9a5608c0da3f6ee2a7fe8ad09
diff --cc README
index 44cd7020e9,6040e8f0d0..e14ae55254
--- a/README
+++ b/README
@@@ -1,8 -1,8 +1,8 @@@
 -This is Python version 3.3.0
 -============================
 +This is Python version 3.4.0 prerelease
 +=======================================
  
  Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
- 2012 Python Software Foundation.  All rights reserved.
+ 2012, 2013 Python Software Foundation.  All rights reserved.
  
  Python 3.x is a new version of the language, which is incompatible with the 2.x
  line of releases.  The language is mostly the same, but many details, especially