| commit | 9a1b956deaddb06341d6cbfa16af9d4eee196e99 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Tue Oct 25 00:04:37 2011 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Tue Oct 25 00:04:37 2011 -0400 |
| tree | dce21295fb88932b9cdfdf5e082c07b8fd4ae1ca | |
| parent | 1fafc1a11f7d4799f252a40e608b0fd4d4fedb68 [diff] | |
| parent | 64c1c0720170dbd78dbac333d4c268439ac856bc [diff] |
merge heads