From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Jan 2017 04:08:51 +0000 (-0600)
Subject: merge 3.6
X-Git-Tag: v3.7.0a1~1644
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6784be1d00c700fce08fd35ce94f0696dedbe493;p=python

merge 3.6
---

6784be1d00c700fce08fd35ce94f0696dedbe493
diff --cc README
index 1b899b2469,4fc97e6013..bd2735da87
--- a/README
+++ b/README
@@@ -1,8 -1,9 +1,9 @@@
 -This is Python version 3.6.1 release candidate 1
 -================================================
 +This is Python version 3.7.0 alpha 1
 +====================================
  
  Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
- 2012, 2013, 2014, 2015, 2016 Python Software Foundation.  All rights reserved.
+ 2012, 2013, 2014, 2015, 2016, 2017 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,