summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-01-01 11:13:16 -0600
committerBenjamin Peterson <benjamin@python.org>2016-01-01 11:13:16 -0600
commitfa1ef1e5250d51918671e3e6f247c32bdd3dc4af (patch)
treef20b7ddcda83f4594453cac5e943fcef538ab1b5
parent71db903563906cedfc098418659d1200043cd14c (diff)
parentf2be8d75acad3f82e8d38299b24b99068b628a6a (diff)
downloadcpython-git-fa1ef1e5250d51918671e3e6f247c32bdd3dc4af.tar.gz
merge 3.5
-rw-r--r--LICENSE5
1 files changed, 3 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE
index a1ea80d59a..84a3337c2e 100644
--- 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