tree 5318e4758c57f22919d053598c1d55696e14d972
parent 27ee75f1913452d7325a1dac7302d402150639f8
parent 66323415c791502aec973cc1b4b755d22b8ba210
author Benjamin Peterson <benjamin@python.org> 1417366276 -0500
committer Benjamin Peterson <benjamin@python.org> 1417366276 -0500
HG:rename-source hg

merge 3.4 (#9179)