[Python-checkins] cpython (merge 3.3 -> 3.4): merge 3.3

[benjamin.peterson]

https://hg.python.org/cpython/rev/4a8c40b32969
changeset:   99736:4a8c40b32969
branch:      3.4
parent:      99731:a74d808a3d2d
parent:      99735:a84a15eafb76
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri Jan 01 11:12:49 2016 -0600
summary:
  merge 3.3

files:
  LICENSE |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -74,8 +74,9 @@
 distribute, and otherwise use Python alone or in any derivative version,
 provided, however, that PSF's License Agreement and PSF's notice of copyright,
 i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-2011, 2012, 2013, 2014, 2015,2016 Python Software Foundation; All Rights Reserved"
-are retained in Python alone or in any derivative version prepared by Licensee.
+2011, 2012, 2013, 2014, 2015, 2016 Python Software Foundation; All Rights
+Reserved" are retained in Python alone or in any derivative version prepared by
+Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on
 or incorporates Python or any part thereof, and wants to make

-- 
Repository URL: https://hg.python.org/cpython