Issue #21431: merge from 3.4

This commit is contained in:
Ned Deily 2014-09-22 14:44:22 -07:00
parent 4bd60980ec
commit b682fd3dbb
2 changed files with 7 additions and 27 deletions

View file

@ -61,7 +61,7 @@ add_module_names = True
# By default, highlight as Python 3.
highlight_language = 'python3'
needs_sphinx = '1.1'
needs_sphinx = '1.2'
# Options for HTML output