diff options
author | Benjamin Peterson <benjamin@python.org> | 2015-01-01 00:10:13 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2015-01-01 00:10:13 (GMT) |
commit | 7919acb9202e1b4cf703d54a9346b980f8885a29 (patch) | |
tree | 2ba4872b50ee3e660aa2bfa97a3a9ba2e0e4db1a /Doc/license.rst | |
parent | 9582b33933692a432d9285a7b89091356e78aad6 (diff) | |
parent | 47e782a67a79e7d4fdc4536c6d6935c0e3b45705 (diff) | |
download | cpython-7919acb9202e1b4cf703d54a9346b980f8885a29.zip cpython-7919acb9202e1b4cf703d54a9346b980f8885a29.tar.gz cpython-7919acb9202e1b4cf703d54a9346b980f8885a29.tar.bz2 |
merge 3.2
Diffstat (limited to 'Doc/license.rst')
-rw-r--r-- | Doc/license.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/license.rst b/Doc/license.rst index 4440c7b..492b80f 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -84,7 +84,7 @@ Terms and conditions for accessing or otherwise using Python analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python |release| alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of - copyright, i.e., "Copyright © 2001-2014 Python Software Foundation; All Rights + copyright, i.e., "Copyright © 2001-2015 Python Software Foundation; All Rights Reserved" are retained in Python |release| alone or in any derivative version prepared by Licensee. |