Graft a89d654adaa2 from 3.2 branch. Fixes #15620.
authorGeorg Brandl <georg@python.org>
Sat, 11 Aug 2012 09:08:04 +0000 (11:08 +0200)
committerGeorg Brandl <georg@python.org>
Sat, 11 Aug 2012 09:08:04 +0000 (11:08 +0200)
1  2 
Lib/test/test_readline.py
Misc/ACKS

Simple merge
diff --cc Misc/ACKS
index 1f098d437cc8b2badcb4e09fd6bc18dce41d2ccc,a1197ad08b0e4490ef6094eb178d71073769c2e4..96dd83779f9ba2ef2e8aca6b678eed7693c3fdf2
+++ b/Misc/ACKS
@@@ -74,6 -79,8 +74,7 @@@ Eric Bese
  Steven Bethard
  Stephen Bevan
  Ron Bickers
 -Adrian von Bidder
+ Natalia B. Bidart
  David Binger
  Dominic Binks
  Philippe Biondi