summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-12-31 22:43:01 -0600
committerBenjamin Peterson <benjamin@python.org>2011-12-31 22:43:01 -0600
commita174577f55634c4de63204b03c0ebcde131cda28 (patch)
treecf095587a263c5f163bad07ce3b208f9f178065f /LICENSE
parent8df168cc7b2798786514a97396da57d334c90f70 (diff)
parentc40d362a1cd6c36635e91b6c7e7dbf3337b55562 (diff)
downloadcpython-git-a174577f55634c4de63204b03c0ebcde131cda28.tar.gz
merge 3.2
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE2
1 files changed, 1 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index 3a37dd6bc8..349cbbf89e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -109,7 +109,7 @@ 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 Python Software Foundation; All Rights Reserved" are retained in Python
+2011, 2012 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