| commit | 369826a879386a6de7e493e5b789fd8a5b5fa5be | [log] [tgz] |
|---|---|---|
| author | Ned Deily <nad@python.org> | Fri Jun 03 15:20:13 2016 -0700 |
| committer | Ned Deily <nad@python.org> | Fri Jun 03 15:20:13 2016 -0700 |
| tree | 997a4a9f9577ecdd726e4534f0c5238b5fc861ec | |
| parent | 6371152154bc888a645906169726cdb8cdf01744 [diff] | |
| parent | f06324280ae0e91cc08c66d0bbd4a0bff3c4436b [diff] |
final step in backout of bad default->3.5 merge d085b4f779af. merge 3.5 heads