commit | e448066268973fdc04328ec8d0c32ebd6becc692 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Thu Oct 29 21:11:29 2015 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Thu Oct 29 21:11:29 2015 -0700 |
tree | d7dae2142ab697e390616dc8be11c1079e60ea82 | |
parent | 4b24d63407213bbb2f0ed09e69362843502fec00 [diff] | |
parent | adf8627f41b22ba0d0ba47a0da12a49ba64064e7 [diff] |
merge 3.5 (#25504)