merge 3.2

PizzaShift · Jan 1, 2012 · a174577 · a174577
2 parents 8df168c + c40d362
commit a174577
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/Doc/README.txt b/Doc/README.txt
@@ -135,7 +135,7 @@ The Python source is copyrighted, but you can freely use and copy it
 as long as you don't change or remove the copyright notice:
 
 ----------------------------------------------------------------------
-Copyright (c) 2000-2011 Python Software Foundation.
+Copyright (c) 2000-2012 Python Software Foundation.
 All rights reserved.
 
 Copyright (c) 2000 BeOpen.com.

diff --git a/Doc/copyright.rst b/Doc/copyright.rst
@@ -4,7 +4,7 @@ Copyright
 
 Python and this documentation is:
 
-Copyright © 2001-2011 Python Software Foundation. All rights reserved.
+Copyright © 2001-2012 Python Software Foundation. All rights reserved.
 
 Copyright © 2000 BeOpen.com. All rights reserved.
 

diff --git a/Doc/license.rst b/Doc/license.rst
@@ -148,7 +148,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-2011 Python Software Foundation; All Rights
+   copyright, i.e., "Copyright © 2001-2012 Python Software Foundation; All Rights
    Reserved" are retained in Python |release| alone or in any derivative version
    prepared by Licensee.
 

diff --git 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

diff --git a/Python/getcopyright.c b/Python/getcopyright.c
@@ -4,7 +4,7 @@
 
 static char cprt[] =
 "\
-Copyright (c) 2001-2011 Python Software Foundation.\n\
+Copyright (c) 2001-2012 Python Software Foundation.\n\
 All Rights Reserved.\n\
 \n\
 Copyright (c) 2000 BeOpen.com.\n\

diff --git a/README b/README
@@ -1,8 +1,8 @@
 This is Python version 3.3 alpha 0
 ==================================
 
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-Python Software Foundation.  All rights reserved.
+Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012 Python Software Foundation.  All rights reserved.
 
 Python 3.x is a new version of the language, which is incompatible with the 2.x
 line of releases.  The language is mostly the same, but many details, especially