[Python-checkins] cpython (merge 3.5 -> default): #24918: merge with 3.5.

[ezio.melotti]

https://hg.python.org/cpython/rev/444d80ae123e
changeset:   100516:444d80ae123e
parent:      100514:1cdb4cb01e22
parent:      100515:78e9c18d3e5b
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Mar 13 11:41:45 2016 +0200
summary:
  #24918: merge with 3.5.

files:
  Doc/tools/pydoctheme/static/pydoctheme.css |  5 +++++
  Misc/ACKS                                  |  1 +
  2 files changed, 6 insertions(+), 0 deletions(-)


diff --git a/Doc/tools/pydoctheme/static/pydoctheme.css b/Doc/tools/pydoctheme/static/pydoctheme.css
--- a/Doc/tools/pydoctheme/static/pydoctheme.css
+++ b/Doc/tools/pydoctheme/static/pydoctheme.css
@@ -176,3 +176,8 @@
 .stableabi {
     color: #229;
 }
+
+.highlight {
+    background: none !important;
+}
+
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -766,6 +766,7 @@
 Jeff Knupp
 Kubilay Kocak
 Greg Kochanski
+Manvisha Kodali
 Damon Kohler
 Marko Kohtala
 Vajrasky Kok

-- 
Repository URL: https://hg.python.org/cpython