merge 3.2

diff --cc Doc/license.rst
Simple merge

diff --cc LICENSE
Simple merge

diff --cc PC/python_nt.rc
Simple merge

diff --cc Python/getcopyright.c
index 130dec1ba8cb32303ce22099a566eeafc890cad1,ba66474d01f41ad6f7113962fd1ee4e7aa11788e..2ad2848aa80bb93f7e8ecaf49d46ff1164c141aa
--- 1/Python/getcopyright.c
--- 2/Python/getcopyright.c
+++ b/Python/getcopyright.c
@@@ -2,9 -2,9 +2,9 @@@
  
  #include "Python.h"
  
 -static char cprt[] =
 +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\

diff --cc README
Simple merge