]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bbf8393 3b66623)
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Tue, 8 May 2012 02:24:05 +0000 (22:24 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 8 May 2012 02:24:05 +0000 (22:24 -0400)
1  2 
Lib/io.py patch | diff1 | diff2 | blob | history

diff --cc Lib/io.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.