commit | 83d8fc265a962a4bdec76c34396a6eb83e961fcd | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Mar 02 11:18:56 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Mar 02 11:18:56 2015 -0500 |
tree | ee3501fed4415e243cae6f2344082d8254e67ff9 | |
parent | 4e02f8f4aec46ffba087e525188a6429a155b8f9 [diff] | |
parent | 5061e67f0f6e08e99b2ca3b560cd64d8cc5aa515 [diff] |
merge 3.4 (#23367)