]> granicus.if.org Git - python/commitdiff
merge 3.3 (#20102)
authorBenjamin Peterson <benjamin@python.org>
Sun, 2 Feb 2014 20:31:07 +0000 (15:31 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 2 Feb 2014 20:31:07 +0000 (15:31 -0500)
1  2 
Lib/shutil.py

diff --cc Lib/shutil.py
Simple merge