commit | 0cf223873e568e40ebf813bb4d5d78536bf53338 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Tue Sep 06 15:54:38 2016 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Tue Sep 06 15:54:38 2016 -0700 |
tree | d79098bf1cb189f8446f93894180e519137d51c8 | |
parent | dc5a3fe4efee222dd8512fd63d9445ae5de42fc1 [diff] | |
parent | 01c340da23075b6f3dc1c5e61c31b1b7d38652ca [diff] |
merge 3.5