From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 1 Jan 2015 00:10:13 +0000 (-0600)
Subject: merge 3.2
X-Git-Tag: v3.4.3rc1~184^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7919acb9202e1b4cf703d54a9346b980f8885a29;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

7919acb9202e1b4cf703d54a9346b980f8885a29
diff --cc Python/getcopyright.c
index 130dec1ba8cb,ba66474d01f4..2ad2848aa80b
--- a/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\