From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 1 Jan 2015 00:11:34 +0000 (-0600)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~259
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52074ac866eb2220a261210a2db5e41dc0bc27df;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

52074ac866eb2220a261210a2db5e41dc0bc27df
diff --cc README
index f5ec5cf537f3,10e71bd3cdfa..c625afa09d31
--- a/README
+++ b/README
@@@ -1,8 -1,8 +1,8 @@@
 -This is Python version 3.4.2
 -============================
 +This is Python version 3.5.0 alpha 1
 +====================================
  
  Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
- 2012, 2013, 2014 Python Software Foundation.  All rights reserved.
+ 2012, 2013, 2014, 2015 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