summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorJack Diederich <jackdied@gmail.com>2009-11-06 21:14:59 (GMT)
committerJack Diederich <jackdied@gmail.com>2009-11-06 21:14:59 (GMT)
commit1fa0c3f5bf2349ffa231608f25de2912479d89bd (patch)
tree5de78ab0e370216cb2001dcf261e17868cfe087a /Misc/ACKS
parenta954607cd3c27bc55d3f42af54d0ba1636f357a9 (diff)
downloadcpython-1fa0c3f5bf2349ffa231608f25de2912479d89bd.zip
cpython-1fa0c3f5bf2349ffa231608f25de2912479d89bd.tar.gz
cpython-1fa0c3f5bf2349ffa231608f25de2912479d89bd.tar.bz2
Merged revisions 74638,76133 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r74638 | jack.diederich | 2009-09-03 16:37:58 -0400 (Thu, 03 Sep 2009) | 4 lines - apply issue 6582 to test all the write methods of telnetlib - add patch author to ACKS - possibly fix test timeouts on non-linux platforms ........ r76133 | jack.diederich | 2009-11-06 12:20:42 -0500 (Fri, 06 Nov 2009) | 3 lines - issue #6748 intermittent test failures from sockets - telnetlib tests now use mock sockets for most tests ........
Diffstat (limited to 'Misc/ACKS')
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index bd2dd69..7715730 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -774,6 +774,7 @@ Wojtek Walczak
Charles Waldman
Richard Walker
Larry Wall
+Rodrigo Steinmuller Wanderley
Greg Ward
Barry Warsaw
Steve Waterbury