summaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2013-01-01 03:37:30 (GMT)
committerBenjamin Peterson <benjamin@python.org>2013-01-01 03:37:30 (GMT)
commitae2039e62cba23d9a5608c0da3f6ee2a7fe8ad09 (patch)
treec320e2b4d95c17b703ef6ca9cebbfa54f92c268e /LICENSE
parent0485314305b87924205159f47dc25ae330ec5ae5 (diff)
parent198399d92c0776248583fcb13670ddc92304512c (diff)
downloadcpython-ae2039e62cba23d9a5608c0da3f6ee2a7fe8ad09.zip
cpython-ae2039e62cba23d9a5608c0da3f6ee2a7fe8ad09.tar.gz
cpython-ae2039e62cba23d9a5608c0da3f6ee2a7fe8ad09.tar.bz2
merge 3.3
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE4
1 files changed, 2 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE
index d98353f..9716405 100644
--- a/LICENSE
+++ b/LICENSE
@@ -111,8 +111,8 @@ 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 Python Software Foundation; All Rights Reserved" are retained in Python
-alone or in any derivative version prepared by Licensee.
+2011, 2012, 2013 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