From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 1 Jan 2014 04:02:41 +0000 (-0600)
Subject: merge 3.3
X-Git-Tag: v3.4.0b2~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a015bb1e2ba036624007d640d27115b4252bd497;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

a015bb1e2ba036624007d640d27115b4252bd497
diff --cc README
index 6a78046d9fa4,0470b1a10319..9a2ee014751c
--- a/README
+++ b/README
@@@ -1,8 -1,8 +1,8 @@@
 -This is Python version 3.3.3
 -============================
 +This is Python version 3.4.0 beta 1
 +===================================
  
  Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
- 2012, 2013 Python Software Foundation.  All rights reserved.
+ 2012, 2013, 2014 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