]> granicus.if.org Git - python/commitdiff
Merge 3.1
authorÉric Araujo <merwok@netwok.org>
Wed, 25 May 2011 16:13:49 +0000 (18:13 +0200)
committerÉric Araujo <merwok@netwok.org>
Wed, 25 May 2011 16:13:49 +0000 (18:13 +0200)
1  2 
Lib/html/parser.py
Lib/pkgutil.py

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