diff options
author | Sandro Tosi <sandro.tosi@gmail.com> | 2011-09-02 19:24:55 (GMT) |
---|---|---|
committer | Sandro Tosi <sandro.tosi@gmail.com> | 2011-09-02 19:24:55 (GMT) |
commit | 154f2b4726ef92e73dbf5d7d8f01df72c2a73101 (patch) | |
tree | 84c3e7368894803825befd3f61af69b3cba63f8e /Doc | |
parent | 9b20e27c01ad995c3950f90dae003437a64f4092 (diff) | |
parent | fbd4fe2195402331b7a529d87b8dcc3f9b81f61d (diff) | |
download | cpython-154f2b4726ef92e73dbf5d7d8f01df72c2a73101.zip cpython-154f2b4726ef92e73dbf5d7d8f01df72c2a73101.tar.gz cpython-154f2b4726ef92e73dbf5d7d8f01df72c2a73101.tar.bz2 |
merge with 3.2
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/ACKS.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt index 9180cf7..164c2c1 100644 --- a/Doc/ACKS.txt +++ b/Doc/ACKS.txt @@ -226,6 +226,7 @@ docs@python.org), and we'll be glad to correct the problem. * Collin Winter * Blake Winton * Dan Wolfe + * Adam Woodbeck * Steven Work * Thomas Wouters * Ka-Ping Yee |