Merge pull request #1201 from vapier/master

author Martin Matuška <martin@matuska.org>

Sun, 19 May 2019 20:23:09 +0000 (22:23 +0200)

committer GitHub <noreply@github.com>

Sun, 19 May 2019 20:23:09 +0000 (22:23 +0200)
author Martin Matuška <martin@matuska.org>
Sun, 19 May 2019 20:23:09 +0000 (22:23 +0200)
committer GitHub <noreply@github.com>
Sun, 19 May 2019 20:23:09 +0000 (22:23 +0200)
diff --cc libarchive/archive_read_support_format_zip.c
Simple merge
author	Martin Matuška <martin@matuska.org>
	Sun, 19 May 2019 20:23:09 +0000 (22:23 +0200)
committer	GitHub <noreply@github.com>
	Sun, 19 May 2019 20:23:09 +0000 (22:23 +0200)