summaryrefslogtreecommitdiffstats
path: root/Doc/license.rst
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-01-01 04:02:41 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-01-01 04:02:41 (GMT)
commita015bb1e2ba036624007d640d27115b4252bd497 (patch)
tree3bba18e6cb907ad2f81c3998bd6e3c6e653f25d5 /Doc/license.rst
parentb6728880927dbd290fd11f553b42316eb9c4b09d (diff)
parentfa10ae097855c5bf927414fce2cc12aee3cdcc98 (diff)
downloadcpython-a015bb1e2ba036624007d640d27115b4252bd497.zip
cpython-a015bb1e2ba036624007d640d27115b4252bd497.tar.gz
cpython-a015bb1e2ba036624007d640d27115b4252bd497.tar.bz2
merge 3.3
Diffstat (limited to 'Doc/license.rst')
-rw-r--r--Doc/license.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/license.rst b/Doc/license.rst
index dc1935b..29d4283 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-2013 Python Software Foundation; All Rights
+ copyright, i.e., "Copyright © 2001-2014 Python Software Foundation; All Rights
Reserved" are retained in Python |release| alone or in any derivative version
prepared by Licensee.