[Python-checkins] cpython (merge default -> default): Trunk merge.

[barry.warsaw]

https://hg.python.org/cpython/rev/823093db83eb
changeset:   93695:823093db83eb
parent:      93694:633565b34b8b
parent:      93689:8eff0fb44013
user:        Barry Warsaw <barry at python.org>
date:        Mon Dec 01 18:17:29 2014 -0500
summary:
  Trunk merge.

files:
  Misc/NEWS |  3 ---
  1 files changed, 0 insertions(+), 3 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -403,9 +403,6 @@
 - Issue #17442: InteractiveInterpreter now displays the full chained traceback
   in its showtraceback method, to match the built in interactive interpreter.
 
-Tools/Demos
------------
-
 - Issue #22314: pydoc now works when the LINES environment variable is set.
 
 - Issue #10510: distutils register and upload methods now use HTML standards

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