Blocked revisions 79389 via svnmerge
commitca5be69e144cd683bb60e55e3cd6fc32fbae5a9a
authorsteven.bethard <steven.bethard@6015fed2-1504-0410-9fe1-9d1591cc4771>
Wed, 24 Mar 2010 23:13:42 +0000 (24 23:13 +0000)
committersteven.bethard <steven.bethard@6015fed2-1504-0410-9fe1-9d1591cc4771>
Wed, 24 Mar 2010 23:13:42 +0000 (24 23:13 +0000)
tree8d344ac5acf3ac851506567c4fefe1aaaa18014f
parent52515d7ebdca8a317c03cb3fddf6c6129aeb3c48
Blocked revisions 79389 via svnmerge

................
  r79389 | steven.bethard | 2010-03-24 16:07:31 -0700 (Wed, 24 Mar 2010) | 9 lines

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

  ........
    r79388 | steven.bethard | 2010-03-24 16:03:24 -0700 (Wed, 24 Mar 2010) | 1 line

    Replace license with simple attribution.
  ........
................

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