[Python-checkins] r83510 - in python/branches/release26-maint: Misc/ACKS

[r.david.murray]

Author: r.david.murray
Date: Mon Aug  2 01:57:22 2010
New Revision: 83510

Log:
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).
................


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Misc/ACKS

Modified: python/branches/release26-maint/Misc/ACKS
==============================================================================
--- python/branches/release26-maint/Misc/ACKS	(original)
+++ python/branches/release26-maint/Misc/ACKS	Mon Aug  2 01:57:22 2010
@@ -170,8 +170,8 @@
 Arnaud Delobelle
 Erik Demaine
 Roger Dev
-Catherine Devlin
 Raghuram Devarakonda
+Catherine Devlin
 Scott Dial
 Toby Dickenson
 Mark Dickinson