| commit | c6fbf47b28173c7bbac9a9e19201876d945859d3 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Fri Feb 24 11:49:07 2012 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Fri Feb 24 11:49:07 2012 -0500 |
| tree | 8bfa5742c45c72766c61f80c875abd6c34652902 | |
| parent | 6eaaeff00e43fe86ea2b832fdb9bf497eab742f7 [diff] | |
| parent | 625cd23da4e760311bd81d8f3f7edba809e981d8 [diff] |
merge heads