tree 13ff9b862fb6d801c051701d82c60e5b789ee421
parent 1caa644ffea384c3482e3da4cb142a2610d7f470
author Georg Brandl <georg@python.org> 1294560106 +0000
committer Georg Brandl <georg@python.org> 1294560106 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/release31-maint%4087887

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

........
  r87789 | georg.brandl | 2011-01-06 10:23:56 +0100 (Do, 06 Jan 2011) | 1 line

  Fix various issues (mostly Python 2 relics) found by Jacques Ducasse.
........
  r87790 | georg.brandl | 2011-01-06 10:25:27 +0100 (Do, 06 Jan 2011) | 1 line

  Add acks where acks are due.
........