commit | b4cfa3ad6391d570d068a142052d6bc0f2602890 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Thu Jun 16 18:51:24 2011 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Thu Jun 16 18:51:24 2011 -0500 |
tree | 064cb49ad5278bc6a855d4b00da1b4849da3738e | |
parent | a08eb73b4a0419b810f6f101f0f36b45ed4f70b9 [diff] | |
parent | a63d45c825386267fd64a423997f9efd4cf1f5a8 [diff] |
merge heads