tree 06f884e13cf1880a0f3a003bc4bb60b0c76a91b3
parent 101e0746d36caa56b93d5c61d8e54938c6edf93b
parent a2389149528c43c24fc6687dc3711a0bb9374279
author Tim Peters <tim@python.org> 1379277618 -0500
committer Tim Peters <tim@python.org> 1379277618 -0500
HG:rename-source hg

Null merge of 3.3 into default.