commit | 2f3d440549345857c7b1a6deb377b5b69052f639 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Mar 02 09:36:48 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Mar 02 09:36:48 2015 -0500 |
tree | 7ddb4b41688960e8f7ae72d691d62d11fe105a15 | |
parent | 5e0fd95e3b002c3265757b98ceeb986bd3cc0f65 [diff] | |
parent | bdf525b77c00d8fad4f713e4f00c245bbfef1ec8 [diff] |
merge 3.4 (#23561)