Merge branch 'PHP-5.4' into PHP-5.5

smalyshev · smalyshev · commit 143ec706388d · 2013-08-10T17:31:48.000-07:00
* PHP-5.4:
  php.ini-development/production: remove php_zip.dll
  Update NEWS
diff --git a/php.ini-development b/php.ini-development
@@ -907,7 +907,6 @@ default_socket_timeout = 60
 ;extension=php_tidy.dll
 ;extension=php_xmlrpc.dll
 ;extension=php_xsl.dll
-;extension=php_zip.dll
 
 ;;;;;;;;;;;;;;;;;;;
 ; Module Settings ;
diff --git a/php.ini-production b/php.ini-production
@@ -907,7 +907,6 @@ default_socket_timeout = 60
 ;extension=php_tidy.dll
 ;extension=php_xmlrpc.dll
 ;extension=php_xsl.dll
-;extension=php_zip.dll
 
 ;;;;;;;;;;;;;;;;;;;
 ; Module Settings ;
