tree f8ba309c529f9fd83894e71e50d6759bbfe674fa
parent 9c3de4a88357cef2753d30c816a238bd74f39273
parent 5ad517a7d9c2694e726b3244505af274f91fb5d9
author Benjamin Peterson <benjamin@python.org> 1313682556 -0500
committer Benjamin Peterson <benjamin@python.org> 1313682556 -0500
HG:rename-source hg

merge 3.2