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

[benjamin.peterson]

http://hg.python.org/cpython/rev/1f263ae10bd6
changeset:   81243:1f263ae10bd6
parent:      81235:290189f6936c
parent:      81242:d547a5444392
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Jan 02 12:23:05 2013 -0600
summary:
  merge 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
@@ -1207,6 +1207,7 @@
 Laurence Tratt
 Alberto Trevino
 Matthias Troffaes
+Tom Tromey
 John Tromp
 Jason Trowbridge
 Brent Tubbs

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