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

[georg.brandl]

https://hg.python.org/cpython/rev/42d768a50926
changeset:   93284:42d768a50926
parent:      93282:b80aa9f887fe
parent:      93283:e016a7d1a0a9
user:        Georg Brandl <georg at python.org>
date:        Thu Oct 30 22:50:48 2014 +0100
summary:
  merge with 3.4

files:
  Doc/distutils/examples.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/distutils/examples.rst b/Doc/distutils/examples.rst
--- a/Doc/distutils/examples.rst
+++ b/Doc/distutils/examples.rst
@@ -264,7 +264,7 @@
 
     desc = """\
     My description
-    =============
+    ==============
 
     This is the description of the ``foobar`` package.
     """

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