]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de075d1 5351ecb)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 24 Nov 2014 01:12:52 +0000 (17:12 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 24 Nov 2014 01:12:52 +0000 (17:12 -0800)
* PHP-5.5:
  Correct two zlib tests to use a string, not a const


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