From: NiLuJe <ninuje@gmail.com>
Date: Sun, 16 Feb 2014 18:53:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master' into cmake-pkgconfig
X-Git-Tag: v3.1.900a~313^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F55%2Fhead;p=thirdparty%2Flibarchive.git

Merge remote-tracking branch 'upstream/master' into cmake-pkgconfig
---

b985a5abdffb5a7c5b568c82564eb425bd1d2f61