From: Stanislav Malyshev <stas@php.net>
Date: Sun, 11 Aug 2013 00:31:59 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~314
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f09b978cc0d149ee54ee154b190b72dc6886be5;p=php

Merge branch 'PHP-5.5'

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

0f09b978cc0d149ee54ee154b190b72dc6886be5