From: Stanislav Malyshev <stas@php.net>
Date: Sun, 11 Aug 2013 00:31:48 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=143ec706388d3d3dcbfe73e4d14f57c97daa134d;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  php.ini-development/production: remove php_zip.dll
  Update NEWS
---

143ec706388d3d3dcbfe73e4d14f57c97daa134d