commit 84ee3103a3d0fd5a56a8d33ddacacafe858d0e1c
author R. David Murray <rdmurray@bitdance.com> Wed Apr 14 19:05:38 2010 +0000
committer R. David Murray <rdmurray@bitdance.com> Wed Apr 14 19:05:38 2010 +0000
tree bd718dcc935222f8a8e0e740ea4ba437a3fb7712
parent 6f353a04a3b94ab8ef22feb32adb70811febc9be

Merged revisions 80078 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80078 | r.david.murray | 2010-04-14 14:59:18 -0400 (Wed, 14 Apr 2010) | 9 lines

  Merged revisions 80062 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80062 | r.david.murray | 2010-04-13 16:57:40 -0400 (Tue, 13 Apr 2010) | 2 lines

    Issue #5277: Fix quote counting when parsing RFC 2231 encoded parameters.
  ........
................

Misc/ACKS

diff --git a/Misc/ACKS b/Misc/ACKS
index 3638cc0..410158a 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -154,6 +154,7 @@
 Steve Cousins
 Alex Coventry
 Matthew Dixon Cowles
+Ryan Coyner
 Christopher A. Craig
 Laura Creighton
 Simon Cross
@@ -654,6 +655,7 @@
 Rich Salz
 Kevin Samborn
 Ilya Sandler
+Mark Sapiro
 Ty Sarna
 Ben Sayer
 Michael Scharf