commit | ba77788bba7ab0b8e2ea50f2c3b30a471b18f941 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Wed Jan 20 22:07:50 2016 -0800 |
committer | Benjamin Peterson <benjamin@python.org> | Wed Jan 20 22:07:50 2016 -0800 |
tree | 360d1efd947b39f4c03f62d108b0f702b8248409 | |
parent | e45abae08f5513e6c4061a04199d67f13745ffa7 [diff] | |
parent | d4d7737c3f294d745d6c121dabb17b76cc11b9c8 [diff] |
merge 3.5