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...)

Author: dstogov

ext/zip/php_zip.h

@@ -38,7 +38,7 @@ extern zend_module_entry zip_module_entry;
 #define ZIP_OVERWRITE ZIP_TRUNCATE
 #endif
 
-#define PHP_ZIP_VERSION "1.12.6dev"
+#define PHP_ZIP_VERSION "1.13.0dev"
 
 #ifndef  Z_SET_REFCOUNT_P
 # if PHP_MAJOR_VERSION < 6 && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 3)