]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Wed, 10 Apr 2013 19:12:48 +0000 (23:12 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 10 Apr 2013 19:12:48 +0000 (23:12 +0400)
* 'PHP-5.5' of git.php.net:php-src:
  update NEWS
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence

1  2 
NEWS

diff --cc NEWS
Simple merge