| commit | ff3d3e4c7a0f2e26e814d84c228144209d39c26f | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Thu Aug 11 14:46:49 2011 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Thu Aug 11 14:46:49 2011 -0500 |
| tree | b220ca7c7742f01ead0f8f9e20063c04cf59e37f | |
| parent | b684702259e064e0b03d92169a9aacbd5427d3d0 [diff] | |
| parent | fdf4a274220d3167234792e91f29eb935c78e15d [diff] |
merge heads