merge with 3.4

This commit is contained in:
Georg Brandl 2014-10-30 22:50:48 +01:00
commit c876cec216

View File

@ -264,7 +264,7 @@ For example, if the :file:`setup.py` script is changed like this::
desc = """\
My description
=============
==============
This is the description of the ``foobar`` package.
"""