From: Hans Kristian Rosbach <hk-github@circlestorm.org>
Date: Fri, 13 Oct 2017 08:22:07 +0000 (+0200)
Subject: Merge pull request #130 from mtl1979/sync
X-Git-Tag: 1.9.9-b1~656
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60dedcc1ff6032ae404a05472b16b0586cacbee1;p=thirdparty%2Fzlib-ng.git

Merge pull request #130 from mtl1979/sync

Sync with zlib development branch
---

60dedcc1ff6032ae404a05472b16b0586cacbee1