| commit | 1adbc6f56a7c08b06b42d8eddc5fd76cfa5815c7 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Thu Jan 12 15:26:20 2012 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Thu Jan 12 15:26:20 2012 -0500 |
| tree | 41779130dc01520c3b2043711c81f6ad46f8c791 | |
| parent | 0c91392fe6eca0c4b45913645f046536d0f53d19 [diff] | |
| parent | dc41e3f23feafcf81b1c6a2d612e2fcc0ef6b63a [diff] |
merge heads