tree 58ea93e875a16483649d42cfb1122d0cc1b8afc3
parent ae6ae025d10d35cf7f125b55f4260826ed0c69b8
parent d6fe58d701e8109ef55ebe71532819f7fc69e9fb
author Benjamin Peterson <benjamin@python.org> 1313534804 -0500
committer Benjamin Peterson <benjamin@python.org> 1313534804 -0500
HG:rename-source hg

merge heads