From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 10 Apr 2013 19:12:48 +0000 (+0400)
Subject: Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
X-Git-Tag: php-5.5.0beta4~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88e14d01bf2ad68aff481f7be08eb670bf2c35ed;p=php

Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  update NEWS
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
---

88e14d01bf2ad68aff481f7be08eb670bf2c35ed