merge 3.3

This commit is contained in:
Benjamin Peterson 2014-12-31 18:11:22 -06:00
commit a453749a78
6 changed files with 7 additions and 7 deletions

View file

@ -4,7 +4,7 @@
static const char cprt[] =
"\
Copyright (c) 2001-2014 Python Software Foundation.\n\
Copyright (c) 2001-2015 Python Software Foundation.\n\
All Rights Reserved.\n\
\n\
Copyright (c) 2000 BeOpen.com.\n\