commit | 71db903563906cedfc098418659d1200043cd14c | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Fri Jan 01 10:25:22 2016 -0600 |
committer | Benjamin Peterson <benjamin@python.org> | Fri Jan 01 10:25:22 2016 -0600 |
tree | ff98ce9b9f201d87e9ae7d8ed1aa3492d5a91046 | |
parent | 288cb25f1a208fe09b9e06ba479e11c1157da4b5 [diff] | |
parent | 4c70293755ce8ea0adc5b224c714da2b7625d232 [diff] |
merge 3.5