tree 9498dd48c73ea91305805a6e1967f32becd39d70
parent 458fc6f98ca9a838af5dcdff64fd48ae3eb64fa9
parent 82f34ada45f96c13eb68927d6beccdcbab2c77b3
author Benjamin Peterson <benjamin@python.org> 1421158831 -0500
committer Benjamin Peterson <benjamin@python.org> 1421158831 -0500
HG:rename-source hg

merge 3.4 (#23221)