Merge branch 'master' of github.com:libarchive/libarchive

author Sergiu Dotenco <sergiu.dotenco@gmail.com>

Sun, 1 Mar 2015 11:28:04 +0000 (12:28 +0100)

committer Sergiu Dotenco <sergiu.dotenco@gmail.com>

Sun, 1 Mar 2015 11:28:04 +0000 (12:28 +0100)
author Sergiu Dotenco <sergiu.dotenco@gmail.com>
Sun, 1 Mar 2015 11:28:04 +0000 (12:28 +0100)
committer Sergiu Dotenco <sergiu.dotenco@gmail.com>
Sun, 1 Mar 2015 11:28:04 +0000 (12:28 +0100)
diff --cc libarchive/archive_read_support_format_zip.c
Simple merge
diff --cc libarchive/archive_write_set_format_warc.c
Simple merge
author	Sergiu Dotenco <sergiu.dotenco@gmail.com>
	Sun, 1 Mar 2015 11:28:04 +0000 (12:28 +0100)
committer	Sergiu Dotenco <sergiu.dotenco@gmail.com>
	Sun, 1 Mar 2015 11:28:04 +0000 (12:28 +0100)
		1	2
libarchive/archive_read_support_format_zip.c	patch \|	diff1 \|	diff2 \|	blob \| history
libarchive/archive_write_set_format_warc.c	patch \|	diff1 \|	diff2 \|	blob \| history