commit | c09087680eb908406d7331323e92a657182c7b89 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Jun 13 23:43:40 2016 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Jun 13 23:43:40 2016 -0700 |
tree | 3d55c28898a015d7eaad922843dd7fc3cef59f33 | |
parent | 965754521e0e8bc5291f2839d8d42c375c5c1eb2 [diff] | |
parent | 11a693d3304eb896de35733848b5bd9f2b5b4ab5 [diff] |
merge 3.5