tree d38f07880cba28ce35be1a3f9c614d18a6973815
parent ab405d557539b46491306bbdc15e1a253678c406
parent d852e997f4117f30b62874cdbfc28e93ee3804c4
author Raymond Hettinger <python@rcn.com> 1395323073 -0700
committer Raymond Hettinger <python@rcn.com> 1395323073 -0700
HG:rename-source hg

merge