]> granicus.if.org Git - python/commitdiff
merge from 3.2
authorSenthil Kumaran <senthil@uthcode.com>
Sat, 21 Jan 2012 03:55:40 +0000 (11:55 +0800)
committerSenthil Kumaran <senthil@uthcode.com>
Sat, 21 Jan 2012 03:55:40 +0000 (11:55 +0800)
1  2 
Lib/test/test_urllib.py
Lib/urllib/request.py
Misc/NEWS

Simple merge
Simple merge
diff --cc Misc/NEWS
Simple merge