commit | 4ebcdac556282b159f5ea2ea480d81cb7cb35ad6 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Wed Dec 07 23:55:03 2016 -0800 |
committer | Benjamin Peterson <benjamin@python.org> | Wed Dec 07 23:55:03 2016 -0800 |
tree | c082e8a01eed934b73eb83b18bffff047b9c4a99 | |
parent | 864a78ed72525041ca52fc99ead8af48c02f6cd5 [diff] | |
parent | 0d5742dec0a44c6fdbb544bc683855ff78554e72 [diff] |
merge 3.6 (#28898)