commit 7fdc746a81a29a5f917fb41500b03c92adf40851
author Georg Brandl <georg@python.org> Sun Jan 09 07:55:46 2011 +0000
committer Georg Brandl <georg@python.org> Sun Jan 09 07:55:46 2011 +0000
tree 4fcfdeda32dbf260b44ac4e0c486674c6191774e
parent 389af0037175ec5327d401b3d4a3b13d509cc926

Merged revisions 87876-87877 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

........
  r87876 | georg.brandl | 2011-01-09 08:38:51 +0100 (So, 09 Jan 2011) | 1 line

  #10869: do not visit root node twice in ast.increment_lineno().
........
  r87877 | georg.brandl | 2011-01-09 08:50:48 +0100 (So, 09 Jan 2011) | 1 line

  Add missing line.
........

Misc/ACKS

diff --git a/Misc/ACKS b/Misc/ACKS
index c34e381..f9a7c40 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -841,6 +841,7 @@
 Rickard Westman
 Jeff Wheeler
 Christopher White
+David White
 Mats Wichmann
 Truida Wiedijk
 Felix Wiemann