commit | ab6e156ed3155e58a2f3c2defdd37d94c6cc76a2 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Jun 11 13:19:34 2016 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Jun 11 13:19:34 2016 -0700 |
tree | a3150051e9d2ac48cb7670776ae159e17cb8301e | |
parent | 6bf8e61984f41b1c93a37489a9b54d2d5412c818 [diff] | |
parent | b0557e729e07e63f36d91d1d631424616373a384 [diff] |
merge 3.5