From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 1 Jan 2012 04:43:01 +0000 (-0600)
Subject: merge 3.2
X-Git-Tag: v3.3.0a1~501
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a174577f55634c4de63204b03c0ebcde131cda28;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

a174577f55634c4de63204b03c0ebcde131cda28
diff --cc README
index 19791ec669b4,34bc9e43bbfb..3df3292f93b0
--- a/README
+++ b/README
@@@ -1,8 -1,8 +1,8 @@@
 -This is Python version 3.2.2
 -============================
 +This is Python version 3.3 alpha 0
 +==================================
  
- Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
- Python Software Foundation.  All rights reserved.
+ Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+ 2012 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