summaryrefslogtreecommitdiff
path: root/Lib/pydoc.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-08-01 22:00:39 +0000
committerGeorg Brandl <georg@python.org>2010-08-01 22:00:39 +0000
commit0ba1f01adfe9132340324203e10671cf9b419b1c (patch)
treee45d45f9f40fb5d6a649d9c5849baba18ec40fdf /Lib/pydoc.py
parent86edb140570f0e1761e6444d78d2a027d58dd240 (diff)
downloadcpython-git-0ba1f01adfe9132340324203e10671cf9b419b1c.tar.gz
Merged revisions 83449 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ................ r83449 | georg.brandl | 2010-08-01 22:59:03 +0200 (So, 01 Aug 2010) | 9 lines Merged revisions 83238 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83238 | georg.brandl | 2010-07-29 19:55:01 +0200 (Do, 29 Jul 2010) | 1 line #4108: the first default entry (User-agent: *) wins. ........ ................
Diffstat (limited to 'Lib/pydoc.py')
0 files changed, 0 insertions, 0 deletions