From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 7 May 2015 09:19:33 +0000 (+0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~70^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5ea3f362c43694ea32244d4e76d5c23d1233017;p=php

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

* 'master' of git.php.net:php-src:
  set ext/zip version to 1.13 (as we have new methods... semver...)
---

e5ea3f362c43694ea32244d4e76d5c23d1233017