]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
authorChristopher Jones <sixd@php.net>
Wed, 2 Oct 2013 12:40:42 +0000 (05:40 -0700)
committerChristopher Jones <sixd@php.net>
Wed, 2 Oct 2013 12:40:42 +0000 (05:40 -0700)
commit6cd0bd82dc9812b8ff3644203830b2952b61df97
tree8ead6bc88396b8c6db4f8939a640b5c33c308d28
parentd56850aaffada2b901d76f667a85fd789c7a0432
parent60e38b3243577abc80ce6bbcfb0b4125b08acb85
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Revert "Make 'make distclean' remove the downloaded pear PHAR"
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())