commit | 804480912c8328df7d042c6e5201cfe4abf21742 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Tue Oct 04 00:00:23 2016 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Tue Oct 04 00:00:23 2016 -0700 |
tree | e78e67f7de97f402c3c2b26093ba3a25230fed3c | |
parent | fb12ce1cb3ded55e17833603715b1a38e15be20d [diff] | |
parent | 8f657c35b978b681e6e919f08358992e1aed7dc1 [diff] |
merge 3.5 (#26617)