From: Nick Coghlan <ncoghlan@gmail.com>
Date: Thu, 17 Mar 2011 02:11:09 +0000 (-0400)
Subject: Tidy up merge with remote
X-Git-Tag: v3.3.0a1~2891^2~13^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bab07a652d811f2621538ffed6c46a41be2da888;p=thirdparty%2FPython%2Fcpython.git

Tidy up merge with remote
---

bab07a652d811f2621538ffed6c46a41be2da888
diff --cc Misc/NEWS
index dd5b3f5372f6,1bce6681c619..90c82a75b0cb
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -241,10 -133,9 +243,12 @@@ Tools/Demo
  
  Tests
  -----
+ 
+ - Issue #11577: improve test coverage of binhex.py. Patch by Arkady Koplyarov.
  
 +- New test_crashers added to exercise the scripts in the Lib/test/crashers
 +  directory and confirm they fail as expected
 +
  - Issue #11578: added test for the timeit module.  Patch Michael Henry.
  
  - Issue #11503: improve test coverage of posixpath.py. Patch by Evan Dandrea.