commit | c6c5e0461174d60b9d8ef35336e9576dbdc6121c | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon May 30 11:15:05 2011 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Mon May 30 11:15:05 2011 -0500 |
tree | 1c03f9845997f30aaafb967ba5ec4ec681d86d18 | |
parent | 758888d437c4c2d398ec322ff1596e1620f5f0dd [diff] | |
parent | 1ae2998f3edaac9d0e98a62847b5d541f5f50ce0 [diff] |
merge heads