]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge 3.2
authorÉric Araujo <merwok@netwok.org>
Mon, 12 Sep 2011 15:41:24 +0000 (17:41 +0200)
committerÉric Araujo <merwok@netwok.org>
Mon, 12 Sep 2011 15:41:24 +0000 (17:41 +0200)
1  2 
Lib/pydoc.py

diff --cc Lib/pydoc.py
Simple merge