merge 3.5

This commit is contained in:
Benjamin Peterson 2016-01-01 10:25:22 -06:00
commit 71db903563
6 changed files with 8 additions and 8 deletions

View file

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