]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge 3.2
authorÉric Araujo <merwok@netwok.org>
Wed, 25 May 2011 16:22:26 +0000 (18:22 +0200)
committerÉric Araujo <merwok@netwok.org>
Wed, 25 May 2011 16:22:26 +0000 (18:22 +0200)
1  2 
Doc/documenting/style.rst
Lib/pkgutil.py

Simple merge
diff --cc Lib/pkgutil.py
Simple merge