[Python-checkins] cpython (merge 3.3 -> default): merge 3.3

[benjamin.peterson]

http://hg.python.org/cpython/rev/47d2664b1da4
changeset:   81185:47d2664b1da4
parent:      81181:4e4c102a018a
parent:      81184:eb7c5a36bd2c
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Dec 31 21:44:06 2012 -0600
summary:
  merge 3.3

files:
  Doc/README.txt |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/README.txt b/Doc/README.txt
--- a/Doc/README.txt
+++ b/Doc/README.txt
@@ -135,7 +135,7 @@
 as long as you don't change or remove the copyright notice:
 
 ----------------------------------------------------------------------
-Copyright (c) 2000-2012 Python Software Foundation.
+Copyright (c) 2000-2013 Python Software Foundation.
 All rights reserved.
 
 Copyright (c) 2000 BeOpen.com.

-- 
Repository URL: http://hg.python.org/cpython