commit | 69252643344ae4e80b4582ec6472401d59b3540b | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Wed Oct 15 11:49:15 2014 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Wed Oct 15 11:49:15 2014 -0400 |
tree | 7ad08d29b09cfcacd87af561dddb845bbc86fac3 | |
parent | 94522ebe388d694c9ec46b01c1ab4777bf6d8c9a [diff] | |
parent | 1cbb3fe775c210459f53386b8172f5f2965ee33b [diff] |
merge 3.4 (#22643)