From: Sergiu Dotenco Date: Sun, 1 Mar 2015 11:28:04 +0000 (+0100) Subject: Merge branch 'master' of github.com:libarchive/libarchive X-Git-Tag: v3.1.900a~103^2~1^2^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=227d528b0686242e26f2bc2edb31e156bb409fdc;p=thirdparty%2Flibarchive.git Merge branch 'master' of github.com:libarchive/libarchive Conflicts: libarchive/archive_read_support_format_zip.c --- 227d528b0686242e26f2bc2edb31e156bb409fdc