]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
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

Simple merge