]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 09bb904 f0f14f7)
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Fri, 13 Mar 2015 03:41:14 +0000 (22:41 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 13 Mar 2015 03:41:14 +0000 (22:41 -0500)
1  2 
Doc/library/zipfile.rst patch | diff1 | diff2 | blob | history

diff --cc Doc/library/zipfile.rst
Simple merge
Unnamed repository; edit this file 'description' to name the repository.