tree e26a699b547c62cf1b22cafdb55f78095f2aec81
parent 893c354a556fa3731644d6698d47c1112bd4b45a
author Alexander Belopolsky <alexander.belopolsky@gmail.com> 1294010772 +0000
committer Alexander Belopolsky <alexander.belopolsky@gmail.com> 1294010772 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/release26-maint%4087664

Merged revisions 87663 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r87663 | alexander.belopolsky | 2011-01-02 18:23:54 -0500 (Sun, 02 Jan 2011) | 13 lines

  Merged revisions 87648,87656 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/branches/py3k

  ........
    r87648 | alexander.belopolsky | 2011-01-02 15:48:22 -0500 (Sun, 02 Jan 2011) | 1 line

    Issue #8013: Fixed time.asctime segfault when OS's asctime fails
  ........
    r87656 | alexander.belopolsky | 2011-01-02 17:16:10 -0500 (Sun, 02 Jan 2011) | 1 line

    Issue #8013: Fixed test
  ........
................