commit | 1af8b63447033e156eaf7bf9620a242089fa9f5b | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Wed Jul 06 14:04:29 2016 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Wed Jul 06 14:04:29 2016 -0700 |
tree | 9792ec9791facceb5fca6141f6893d323bc83ed5 | |
parent | 9409b4aa8f00c227b7157c7149ea3e4c8f1810b5 [diff] | |
parent | ede9a0ffa23392a35c5ae5f1688b83c180dbbf08 [diff] |
merge 3.4