diff options
author | Brian Curtin <brian@python.org> | 2013-05-16 17:03:40 (GMT) |
---|---|---|
committer | Brian Curtin <brian@python.org> | 2013-05-16 17:03:40 (GMT) |
commit | e914123d1f07159f32bf4330556397ce4d590189 (patch) | |
tree | 9a62ece442758a250313d11815a8603297c03f67 | |
parent | 3cb09064a3842b4f80768b983f7867d62a779cef (diff) | |
parent | 2502ebf9c99df1883b49aa71f7b6494e70938603 (diff) | |
download | cpython-e914123d1f07159f32bf4330556397ce4d590189.zip cpython-e914123d1f07159f32bf4330556397ce4d590189.tar.gz cpython-e914123d1f07159f32bf4330556397ce4d590189.tar.bz2 |
Merge with 3.3
-rw-r--r-- | Misc/ACKS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1161,6 +1161,7 @@ George Sipe J. Sipprell Kragen Sitaker Michael Sloan +Nick Sloan Václav Šmilauer Christopher Smith Eric V. Smith |