commit | 5027a5070dfb939df37f76c998ed907d972e6406 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Thu Sep 25 01:07:54 2014 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Thu Sep 25 01:07:54 2014 -0400 |
tree | 9b37c5e523553c6ee5175f91f12aa1a5b5743995 | |
parent | f45ea46fe8f1d22ac7602f280f9c4e4deb6562ba [diff] | |
parent | 8c0e0ab767f0d6f8395d8c317b08977563b70d41 [diff] |
merge 3.4