merge 3.4

f2be8d75 · Benjamin Peterson · 4c702937 · 86fb46d4 · f2be8d75
Commit f2be8d75 authored Jan 01, 2016 by Benjamin Peterson
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

LICENSE LICENSE +3 -2

No files found.
--- a/LICENSE
+++ b/LICENSE
@@ -74,8 +74,9 @@ analyze, test, perform and/or display publicly, prepare derivative works,
 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