merge 3.2

This commit is contained in:
Benjamin Peterson 2011-12-31 22:43:01 -06:00
commit a174577f55
6 changed files with 7 additions and 7 deletions

View file

@ -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\