[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5

[yury.selivanov]

https://hg.python.org/cpython/rev/67ae0fd72370
changeset:   96749:67ae0fd72370
parent:      96747:4bf1d332fe73
parent:      96748:68996acdec6f
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Wed Jul 01 21:07:20 2015 -0400
summary:
  Merge 3.5

files:
  Doc/conf.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/conf.py b/Doc/conf.py
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -44,7 +44,7 @@
 # -----------------------
 
 # Use our custom theme.
-html_theme = 'classic'
+html_theme = 'pydoctheme'
 html_theme_path = ['tools']
 html_theme_options = {'collapsiblesidebar': True}
 

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