merge 3.6

This commit is contained in:
Benjamin Peterson 2017-01-01 22:08:51 -06:00
commit 6784be1d00
7 changed files with 9 additions and 8 deletions

View file

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