From: Benjamin Peterson Date: Thu, 1 Jan 2015 00:11:22 +0000 (-0600) Subject: merge 3.3 X-Git-Tag: v3.4.3rc1~184 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a453749a785d245004309d9e8f12b39f7916a24d;p=python merge 3.3 --- a453749a785d245004309d9e8f12b39f7916a24d diff --cc Doc/license.rst index 32c172e7d7,492b80f8ed..53a1c4d57e --- a/Doc/license.rst +++ b/Doc/license.rst @@@ -84,9 -84,9 +84,9 @@@ Terms and conditions for accessing or o 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. ++ 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. #. In the event Licensee prepares a derivative work that is based on or incorporates Python |release| or any part thereof, and wants to make the