[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3

[georg.brandl]

http://hg.python.org/cpython/rev/c9aefabc63b2
changeset:   86288:c9aefabc63b2
parent:      86285:614597994b7c
parent:      86287:c86c6d215ab6
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 13 09:56:24 2013 +0200
summary:
  merge with 3.3

files:
  Doc/tools/sphinxext/static/basic.css |  6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Doc/tools/sphinxext/static/basic.css b/Doc/tools/sphinxext/static/basic.css
--- a/Doc/tools/sphinxext/static/basic.css
+++ b/Doc/tools/sphinxext/static/basic.css
@@ -337,7 +337,11 @@
 .deprecated, .deprecated-removed {
     background-color: #ffe4e4;
     border: 1px solid #f66;
-    padding: 7px
+    padding: 7px;
+}
+
+div.deprecated p {
+    margin-bottom: 0;
 }
 
 .system-message {

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