From: Anatol Belski <ab@php.net>
Date: Sun, 23 Apr 2017 19:34:31 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.5RC1~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b720160444cece6269c76f03246f2c64f70c0ac7;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  extend zlib export required for the recent libpng
---

b720160444cece6269c76f03246f2c64f70c0ac7