merge with 3.2

sandrotosi · sandrotosi · commit 154f2b4726ef · 2011-09-02T21:24:55.000+02:00
diff --git 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
