| commit | da037616b10fc12a213e67711065f8123fb98cef | [log] [tgz] |
|---|---|---|
| author | Brett Cannon <brett@python.org> | Sat Jun 25 10:50:24 2016 -0700 |
| committer | Brett Cannon <brett@python.org> | Sat Jun 25 10:50:24 2016 -0700 |
| tree | 24fdcc554f0a01dd3c84070669f4f343fedaf229 | |
| parent | b466f8facf9ae8e893c30b7a7a76a8333b59d5c7 [diff] | |
| parent | e92dc9c23da8cb11f922f28353e6a58928aa5c71 [diff] |
Merge from 3.5