[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/9a84cab7ff9d
changeset:   76488:9a84cab7ff9d
parent:      76485:6e5855854a2e
parent:      76486:505828be1711
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Apr 23 11:25:49 2012 -0400
summary:
  merge 3.2

files:
  Misc/ACKS |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -933,6 +933,7 @@
 Denis Severson
 Ian Seyer
 Ha Shao
+Mark Shannon
 Richard Shapiro
 Bruce Sherwood
 Alexander Shigin

-- 
Repository URL: http://hg.python.org/cpython