tree 39dd1ca9155aa4e3b5b085369c2d46ba0f951383
parent b044b2a701179dc6f8d50d28c7d4486e0d0d7a09
author Georg Brandl <georg@python.org> 1253117346 +0000
committer Georg Brandl <georg@python.org> 1253117346 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/release31-maint%4074837

Merged revisions 74792,74810 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k

................
  r74792 | georg.brandl | 2009-09-14 16:49:30 +0200 (Mo, 14 Sep 2009) | 9 lines

  Recorded merge of revisions 74791 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r74791 | georg.brandl | 2009-09-14 16:08:54 +0200 (Mo, 14 Sep 2009) | 1 line

    #6574: list the future features in a table.
  ........
................
  r74810 | georg.brandl | 2009-09-15 21:55:15 +0200 (Di, 15 Sep 2009) | 1 line

  Do not document the most important (at least for Guido) future import.
................