tree bc03d5f7dcfc79f277987cfc55d24c8f690638ac
parent b2bf01d824ea5a13b375d0aa79211c01f8ab726a
parent 982c91e4c9bbf8b8b62cda779d31beac2350fa58
author Benjamin Peterson <benjamin@python.org> 1326323860 -0500
committer Benjamin Peterson <benjamin@python.org> 1326323860 -0500
HG:rename-source hg

merge heads