From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 10 Apr 2013 19:12:25 +0000 (+0400)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-5.6.0alpha1~448^2~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6893a19dbf1ca8f9b269f2bb0109cff745d30e87;p=php

Merge branch 'master' of git.php.net:php-src

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

6893a19dbf1ca8f9b269f2bb0109cff745d30e87