merge 2.7.11 branch
diff --git a/.hgtags b/.hgtags
index 469f071..3882646 100644
--- a/.hgtags
+++ b/.hgtags
@@ -171,3 +171,4 @@
 80ccce248ba2657ed5da3ccf7999f35b78827f5e v2.7.10rc1
 15c95b7d81dcf821daade360741e00714667653f v2.7.10
 82dd9545bd93d6e7a9821e1dabc7b25508d0fa3a v2.7.11rc1
+6d1b6a68f775fada9877d295e62958bafa1ca11e v2.7.11
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index ce75119..3538831 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -23,11 +23,11 @@
 #define PY_MAJOR_VERSION	2
 #define PY_MINOR_VERSION	7
 #define PY_MICRO_VERSION	11
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL	1
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
+#define PY_RELEASE_SERIAL	0
 
 /* Version as a string */
-#define PY_VERSION      	"2.7.11rc1+"
+#define PY_VERSION      	"2.7.11"
 /*--end constants--*/
 
 /* Subversion Revision number of this file (not of the repository). Empty
diff --git a/Misc/NEWS b/Misc/NEWS
index 2a456bb..54dd101 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -59,9 +59,6 @@
 
 *Release date: 2015-12-05*
 
-Core and Builtins
------------------
-
 Library
 -------