diff options
author | Pierre Joye <pierre.php@gmail.com> | 2013-01-08 15:16:35 +0100 |
---|---|---|
committer | Pierre Joye <pierre.php@gmail.com> | 2013-01-08 15:16:35 +0100 |
commit | f566b4d32183032663ecb35895c0dafd8e051853 (patch) | |
tree | cea62c1623f1667f3ed92194b9d701c20a05ef51 /ext/zip/php_zip.c | |
parent | 7a13ce61e02d1894224a0c3009dac74990666926 (diff) | |
parent | 10a2c0d574be62be1f0224d23909e27e74c87445 (diff) | |
download | php-git-f566b4d32183032663ecb35895c0dafd8e051853.tar.gz |
Merge branch 'PHP-5.5'
* PHP-5.5:
- fix bug #47358, glob returns error, should be empty array()
- NEWS entry for #50524
Diffstat (limited to 'ext/zip/php_zip.c')
0 files changed, 0 insertions, 0 deletions