From: Anatol Belski <ab@php.net>
Date: Wed, 10 Apr 2013 18:45:28 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta4~45^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0655ab7c261840d8068c7360af5cda5351cffc22;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
---

0655ab7c261840d8068c7360af5cda5351cffc22