[Python-checkins] cpython (merge 3.3 -> default): Merge with 3.3

[brian.curtin]

http://hg.python.org/cpython/rev/5b89f1b09756
changeset:   83790:5b89f1b09756
parent:      83788:3ee61b048173
parent:      83789:d62f71bd2192
user:        Brian Curtin <brian at python.org>
date:        Thu May 16 12:03:40 2013 -0500
summary:
  Merge with 3.3

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
@@ -1161,6 +1161,7 @@
 J. Sipprell
 Kragen Sitaker
 Michael Sloan
+Nick Sloan
 Václav Šmilauer
 Christopher Smith
 Eric V. Smith

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