tree f538f16ea3abbb8635782a892bf59b4d5cc01e67
parent 88b95f910547fbd12e1675afee88a76a471c0b97
parent b4c8902a8727f99a4d361f6a3ebafa5002e56030
author Georg Brandl <georg@python.org> 1336298784 +0200
committer Georg Brandl <georg@python.org> 1336298784 +0200
HG:rename-source hg

merge with 3.2