]> granicus.if.org Git - python/commitdiff
Merge #11488 patch from 3.1.
authorR David Murray <rdmurray@bitdance.com>
Mon, 14 Mar 2011 13:57:03 +0000 (09:57 -0400)
committerR David Murray <rdmurray@bitdance.com>
Mon, 14 Mar 2011 13:57:03 +0000 (09:57 -0400)
1  2 
Lib/test/test_tempfile.py
Misc/ACKS

Simple merge
diff --cc Misc/ACKS
Simple merge