commit | 63604032af6a0c0e869d8783f850e2418306a605 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Sep 05 16:27:08 2016 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Sep 05 16:27:08 2016 -0700 |
tree | c09e4d520147d354621e94226c2746716cae47f2 | |
parent | dd2afe9edceb2879cea4bb5a81a748a6d2569956 [diff] | |
parent | 6d999803a07ef5e01f0048d4f276e9cf4401a23d [diff] |
merge 3.5