summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-03-12 20:09:00 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-03-12 20:09:00 (GMT)
commit67266d1993b96867f85dc90d89fbe1019f0471f4 (patch)
tree310007fbcaeaa38dc54b6c0b0f1df0c24baf973d /Misc
parente8f3819567293bece741ae61b14564295025199b (diff)
parentf993399c40389cbe3e32d859eae71b46ca263035 (diff)
downloadcpython-67266d1993b96867f85dc90d89fbe1019f0471f4.zip
cpython-67266d1993b96867f85dc90d89fbe1019f0471f4.tar.gz
cpython-67266d1993b96867f85dc90d89fbe1019f0471f4.tar.bz2
merge 3.3
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 2ed4199..b8aaf75 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1098,6 +1098,7 @@ Andy Robinson
Jim Robinson
Mark Roddy
Kevin Rodgers
+Sean Rodman
Giampaolo Rodola
Elson Rodriguez
Adi Roiban