merge with stable

This commit is contained in:
Georg Brandl
2014-01-22 18:13:49 +01:00
12 changed files with 229 additions and 37 deletions

View File

@@ -39,9 +39,6 @@ Among its features are the following:
* Various extensions are available, e.g. for automatic testing of snippets
and inclusion of appropriately formatted docstrings
* Setuptools integration
A development egg can be found `here
<http://bitbucket.org/birkenfeld/sphinx/get/tip.gz#egg=Sphinx-dev>`_.
'''
if sys.version_info < (2, 6) or (3, 0) <= sys.version_info < (3, 2):