From: R. David Murray Date: Sun, 1 Aug 2010 23:57:22 +0000 (+0000) Subject: Merged revisions 83508-83509 via svnmerge from X-Git-Tag: v2.6.6rc1~78 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e8e508b31f2ace5962126c4f01c56d9d3d10e60;p=thirdparty%2FPython%2Fcpython.git Merged revisions 83508-83509 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ................ r83508 | r.david.murray | 2010-08-01 19:52:42 -0400 (Sun, 01 Aug 2010) | 9 lines Merged revisions 83506 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83506 | r.david.murray | 2010-08-01 19:43:28 -0400 (Sun, 01 Aug 2010) | 2 lines Fix ACKS alphabetization. ........ ................ r83509 | r.david.murray | 2010-08-01 19:53:40 -0400 (Sun, 01 Aug 2010) | 2 lines Fix the alphabetization fix (bad merge). ................ --- diff --git a/Misc/ACKS b/Misc/ACKS index dd86e5c070d3..757bc1d90d21 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -170,8 +170,8 @@ Vincent Delft Arnaud Delobelle Erik Demaine Roger Dev -Catherine Devlin Raghuram Devarakonda +Catherine Devlin Scott Dial Toby Dickenson Mark Dickinson