diff options
author | Christopher Jones <sixd@php.net> | 2013-10-01 10:19:45 -0700 |
---|---|---|
committer | Christopher Jones <sixd@php.net> | 2013-10-01 10:19:45 -0700 |
commit | 471413ab19f1052d2f7e950229d661547f6e1657 (patch) | |
tree | 22f7e89e004b68c7adc8c831273db68ca2b38939 /ext/xmlreader/php_xmlreader.c | |
parent | 954a0f8bf4f8779f509b8361c1bc02246bd1ea20 (diff) | |
parent | 54c08e3e1e3bff8aa51571e41839d5190a0543d2 (diff) | |
download | php-git-471413ab19f1052d2f7e950229d661547f6e1657.tar.gz |
Merge branch 'master' of https://git.php.net/repository/php-src
# By Michael Wallner (2) and Dmitry Stogov (1)
# Via Michael Wallner (5) and others
* 'master' of https://git.php.net/repository/php-src:
fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
Fixed bug #61548
Reverted patch (it was used for internal testing and was committed by accident)
Diffstat (limited to 'ext/xmlreader/php_xmlreader.c')
0 files changed, 0 insertions, 0 deletions