diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-01-01 00:11:22 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-01-01 00:11:22 (GMT) |
| commit | a453749a785d245004309d9e8f12b39f7916a24d (patch) | |
| tree | cac2c8f14ac442d51787f4deb0ae636b01e3fbc1 /Doc/license.rst | |
| parent | bab69bf6555664a7f68ac87685216d6c8b390865 (diff) | |
| parent | 7919acb9202e1b4cf703d54a9346b980f8885a29 (diff) | |
| download | cpython-a453749a785d245004309d9e8f12b39f7916a24d.zip cpython-a453749a785d245004309d9e8f12b39f7916a24d.tar.gz cpython-a453749a785d245004309d9e8f12b39f7916a24d.tar.bz2 | |
merge 3.3
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 32c172e..53a1c4d 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 + 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. |