commit | dc8899f0e2e04a5b6f5a4aae5b91be04feccb711 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Wed Oct 15 13:40:15 2014 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Wed Oct 15 13:40:15 2014 -0400 |
tree | cdb77b2e9aaf6a77d66e951f5de7743e292ca329 | |
parent | 736982d36dd513233a2b0e0c05b2eb3b514c3d97 [diff] | |
parent | 3f9f612b7ded1da1e91b5cddc198e6e281c215c0 [diff] |
merge 3.4 (#22643)