From: NiLuJe <ninuje@gmail.com>
Date: Tue, 24 Dec 2013 17:49:48 +0000 (+0100)
Subject: Merge branch 'master' into fix-mingw
X-Git-Tag: v3.1.900a~338
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc2220ac751597433dfc767c786fd128111eb356;p=thirdparty%2Flibarchive.git

Merge branch 'master' into fix-mingw
---

cc2220ac751597433dfc767c786fd128111eb356