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

Merge branch 'master' into cmake-pkgconfig
---

6e0562c5d5017a524d3d0c3d0ecd0f9b1bfdd1b7