From: Hans Kristian Rosbach <hk-github@circlestorm.org>
Date: Fri, 25 Aug 2017 07:43:40 +0000 (+0200)
Subject: Merge pull request #115 from Dead2/hacknslash7
X-Git-Tag: 1.9.9-b1~660
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5a9b75872f15f885cbfa35f08e42faf0cdef5a5;p=thirdparty%2Fzlib-ng.git

Merge pull request #115 from Dead2/hacknslash7

Merge Hacknslash7
---

d5a9b75872f15f885cbfa35f08e42faf0cdef5a5