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

[terry.reedy]

https://hg.python.org/cpython/rev/6c208ce96789
changeset:   96264:6c208ce96789
parent:      96262:e4f15eb8e471
parent:      96263:161d08bd1605
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Sat May 23 18:15:41 2015 -0400
summary:
  Merge with 3.4

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


diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -974,7 +974,7 @@
 import by other programs, it gets improvements with every release. See
 :file:`Lib/idlelib/NEWS.txt` for a cumulative list of changes since 3.3.0,
 as well as changes made in future 3.4.x releases. This file is also available
-from the IDLE Help -> About Idle dialog. 
+from the IDLE Help -> About Idle dialog.
 
 
 importlib

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