]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aeb6e9c 4b61203)
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
authorChristopher Jones <sixd@php.net>
Tue, 1 Oct 2013 17:19:40 +0000 (10:19 -0700)
committerChristopher Jones <sixd@php.net>
Tue, 1 Oct 2013 17:19:40 +0000 (10:19 -0700)
# By Michael Wallner (2) and Dmitry Stogov (1)
# Via Michael Wallner (3) and Christopher Jones (1)
* 'PHP-5.5' 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)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.