merge with 3.2

2011-09-02 21:24:55 +02:00 · 2011-09-02 21:24:55 +02:00 · 154f2b4726
parent 9b20e27c01 fbd4fe2195
commit 154f2b4726
1 changed files with 1 additions and 0 deletions
--- 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