commit | 4365833d11fb8e0139d9e8a543692e963a749e38 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sun Jan 01 22:08:33 2017 -0600 |
committer | Benjamin Peterson <benjamin@python.org> | Sun Jan 01 22:08:33 2017 -0600 |
tree | 43a628b6412fd9655529b50258f60a6762618e7d | |
parent | 4950ae14916e340e5274ce0b8277aec9006bd035 [diff] | |
parent | b6e2142b0cf96ffd081eff1f4f6d90074efa0ead [diff] |
merge 3.4