tree abc74f208c27a293180261a7fa75359d305a04c5
parent d3d9ae2c19b9e627683c667387b12c0372382703
parent e43c03508f7f3f9520e6d382e4cb0a02deb91bb4
author Barry Warsaw <barry@python.org> 1423242057 -0500
committer Barry Warsaw <barry@python.org> 1423242057 -0500
HG:rename-source hg

Merge