Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Sun, 23 Apr 2017 19:28:26 +0000 (21:28 +0200)
committerAnatol Belski <ab@php.net>
Sun, 23 Apr 2017 19:28:26 +0000 (21:28 +0200)
commit144ddd3b423e42d3e102ec9676376cba0af8881a
tree009216653ba2db29984d1410805e40fd30839537
parentfa72b039dac5606d1a65096db695efbfa194548e
parent2909742326c18b935080288a9b47260f27db88c4
Merge branch 'PHP-7.0' into PHP-7.1

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