]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cbde4a6 d52513c)
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Fri, 22 Jan 2016 06:04:04 +0000 (22:04 -0800)
committerBenjamin Peterson <benjamin@python.org>
Fri, 22 Jan 2016 06:04:04 +0000 (22:04 -0800)
1  2 
Modules/zipimport.c patch | diff1 | diff2 | blob | history

diff --cc Modules/zipimport.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.