tree 5fd0563368f50292c670322b433fd27caa3dbd09
parent 3661473ae00fd8a82dd693de8b7ca2c1c907978a
parent 27509ce8d99d897579fb7bd333d471eceed9a87a
author Barry Warsaw <barry@python.org> 1334071843 -0400
committer Barry Warsaw <barry@python.org> 1334071843 -0400
HG:rename Lib/pydoc_topics.py:Lib/pydoc_data/topics.py
HG:rename Misc/RPM/python-2.6.spec:Misc/RPM/python-2.7.spec

Mostly null merge from 2.6; tag added