From: Hans Kristian Rosbach <hk-github@circlestorm.org>
Date: Fri, 8 May 2015 13:02:56 +0000 (+0200)
Subject: Merge pull request #21 from daxtens/develop
X-Git-Tag: 1.9.9-b1~859^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfd6636c7a741158cdb524cc87e4e6bb0e206da4;p=thirdparty%2Fzlib-ng.git

Merge pull request #21 from daxtens/develop

Unbreak things: import the right zconf.h
---

cfd6636c7a741158cdb524cc87e4e6bb0e206da4