diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2014-03-21 16:16:10 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2014-03-21 16:16:10 (GMT) |
commit | 6e643edfe7545759fd9f262c99825d227a12a68e (patch) | |
tree | 75787adf85b136178f9053a54a2ed46f3f98c247 /Lib/pydoc.py | |
parent | 33a40003745302eff5e6031d24d26642763fb6d8 (diff) | |
parent | 6bc239619ce93840ac3a3379dcbb32baa8e94e0e (diff) | |
download | cpython-6e643edfe7545759fd9f262c99825d227a12a68e.zip cpython-6e643edfe7545759fd9f262c99825d227a12a68e.tar.gz cpython-6e643edfe7545759fd9f262c99825d227a12a68e.tar.bz2 |
Null merge (I transplated 2 commits from default to 3.4)
Diffstat (limited to 'Lib/pydoc.py')
0 files changed, 0 insertions, 0 deletions