From: Remi Collet <remi@php.net>
Date: Mon, 30 Dec 2013 06:38:45 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=764190c1d6ccf3d4ae2cc54aacb465ccff49d9cc;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Sync with pecl/zip 1.12.4dev
---

764190c1d6ccf3d4ae2cc54aacb465ccff49d9cc