commit | 2145387abc6b1b3b2695cac72cbfc83b5efeeec9 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Tue Jan 31 23:31:20 2017 -0800 |
committer | Benjamin Peterson <benjamin@python.org> | Tue Jan 31 23:31:20 2017 -0800 |
tree | c2bc0fc7a8204081d629721881bb2aca32333d5d | |
parent | ef158c3ced3fce39e43f54e8d149dc2714e3456e [diff] | |
parent | 2b3f4c1efba963e76161445904e3a43ff8777395 [diff] |
merge 3.6 (#29398)