commit | 455fa0a314b7f7edd0c8554b12a65267ff1e2e5b | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Tue Oct 09 11:16:26 2012 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Tue Oct 09 11:16:26 2012 -0400 |
tree | a4db0395d8674c1e3c4119f0edccf72307b34e49 | |
parent | b29614e047110f4d9af993a6cdec4e3fb7ef9738 [diff] | |
parent | 831893a68ec7114c1fc9c8e36b9159f5c1db50c7 [diff] |
merge heads