commit | 6b879fa402cfb23136d0004c2ed154cdc76db919 | [log] [tgz] |
---|---|---|
author | Brian Curtin <brian@python.org> | Mon Oct 29 18:18:43 2012 -0500 |
committer | Brian Curtin <brian@python.org> | Mon Oct 29 18:18:43 2012 -0500 |
tree | 1d58fad5e17b3f0ec3e3d4b697ce2e0e66379132 | |
parent | 4648b4779acd3d75d5f4b0b1438cb2af51cc06b2 [diff] | |
parent | e9aeca7c248bab56201ee5949e0535f96b54865b [diff] |
Merge 3.2