]> granicus.if.org Git - php/commit
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)
commit34c1ba5685e5f86f98f0e1b38c95c7dacc106e3b
treef082be380cc0fcc9e71d5e5c8cfc351c55cbd962
parentde075d172c1fe218e1a7a5c2dbd5fa84f9af0e1d
parent5351ecbfca18a86b44e5cadef67a2d6fc153a907
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Correct two zlib tests to use a string, not a const