Merged revisions 79075 via svnmerge from
commit8ba9d70ab5c57ec1315fa637a6c343cebba8bec3
authorbenjamin.peterson <benjamin.peterson@6015fed2-1504-0410-9fe1-9d1591cc4771>
Thu, 18 Mar 2010 23:01:29 +0000 (18 23:01 +0000)
committerbenjamin.peterson <benjamin.peterson@6015fed2-1504-0410-9fe1-9d1591cc4771>
Thu, 18 Mar 2010 23:01:29 +0000 (18 23:01 +0000)
tree28e3f571ce078b66145a3d13ff5dcb6851ee8ca1
parent296fbccff1b34f244f87aefa7719b25cb1e3d7b1
Merged revisions 79075 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79075 | benjamin.peterson | 2010-03-18 17:58:19 -0500 (Thu, 18 Mar 2010) | 9 lines

  Merged revisions 79073 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79073 | benjamin.peterson | 2010-03-18 17:55:46 -0500 (Thu, 18 Mar 2010) | 1 line

    reignore bad_coding
  ........
................

git-svn-id: http://svn.python.org/projects/python/branches/release31-maint@79076 6015fed2-1504-0410-9fe1-9d1591cc4771
Makefile.pre.in