commit | 10dcff7a0415b302d5eb8de8e7763c7eab85e3dc | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Oct 10 19:36:51 2015 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Oct 10 19:36:51 2015 -0700 |
tree | fb21255a2f2b3c4553f3b40ebc45b9dc43348710 | |
parent | 90ccccf9ed408f2a70c253fc2b5f4b3b5f4da33f [diff] | |
parent | 062f4cec5e457a78068c942faef999886adf53ff [diff] |
merge 3.5 (#25362)