commit 4c70293755ce8ea0adc5b224c714da2b7625d232
author Benjamin Peterson <benjamin@python.org> Fri Jan 01 10:25:12 2016 -0600
committer Benjamin Peterson <benjamin@python.org> Fri Jan 01 10:25:12 2016 -0600
tree 0de9b5bf2f7dd0132d08bfa1fb6216ea9647d814
parent 42bf8fc90158072ff0136a7c8bfa0b0dba3a70d6
parent e8c2a957c87980a1fd79c39597d40e5c5aeb7048

merge 3.4

PC/python_ver_rc.h

diff --git a/PC/python_ver_rc.h b/PC/python_ver_rc.h
index 827e9be..8ad18ef 100644
--- a/PC/python_ver_rc.h
+++ b/PC/python_ver_rc.h
@@ -4,7 +4,7 @@
 #include "winver.h"
 
 #define PYTHON_COMPANY   "Python Software Foundation"
-#define PYTHON_COPYRIGHT "Copyright \xA9 2001-2015 Python Software Foundation. Copyright \xA9 2000 BeOpen.com. Copyright \xA9 1995-2001 CNRI. Copyright \xA9 1991-1995 SMC."
+#define PYTHON_COPYRIGHT "Copyright \xA9 2001-2016 Python Software Foundation. Copyright \xA9 2000 BeOpen.com. Copyright \xA9 1995-2001 CNRI. Copyright \xA9 1991-1995 SMC."
 
 #define MS_WINDOWS
 #include "modsupport.h"