summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Curtin <brian@python.org>2013-05-16 17:03:40 (GMT)
committerBrian Curtin <brian@python.org>2013-05-16 17:03:40 (GMT)
commite914123d1f07159f32bf4330556397ce4d590189 (patch)
tree9a62ece442758a250313d11815a8603297c03f67
parent3cb09064a3842b4f80768b983f7867d62a779cef (diff)
parent2502ebf9c99df1883b49aa71f7b6494e70938603 (diff)
downloadcpython-e914123d1f07159f32bf4330556397ce4d590189.zip
cpython-e914123d1f07159f32bf4330556397ce4d590189.tar.gz
cpython-e914123d1f07159f32bf4330556397ce4d590189.tar.bz2
Merge with 3.3
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 6d08530..6adb14a 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1161,6 +1161,7 @@ George Sipe
J. Sipprell
Kragen Sitaker
Michael Sloan
+Nick Sloan
Václav Šmilauer
Christopher Smith
Eric V. Smith