]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Merge remote-tracking branch 'upstream/master' into cmake-pkgconfig 55/head
authorNiLuJe <ninuje@gmail.com>
Sun, 16 Feb 2014 18:53:01 +0000 (19:53 +0100)
committerNiLuJe <ninuje@gmail.com>
Sun, 16 Feb 2014 18:53:01 +0000 (19:53 +0100)

Trivial merge