| commit | acaeff8f159a452ecda6be3ec9b2aeeaedc029f3 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Thu Aug 18 13:54:16 2011 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Thu Aug 18 13:54:16 2011 -0500 |
| tree | 4564bc9a654491e5ee7de7376395177cf577785e | |
| parent | 7a6b44ab6275aeeb8959437f10ae9ca17aa0b2e4 [diff] | |
| parent | 134a8baed9b70b2d6a953d0c872fc2c42580e1b6 [diff] |
merge heads