]> granicus.if.org Git - php/commit
Merge branch 'pull-request/817'
authorStanislav Malyshev <stas@php.net>
Mon, 24 Nov 2014 01:13:03 +0000 (17:13 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 24 Nov 2014 01:13:03 +0000 (17:13 -0800)
commit0bf0c12abfba2ccf7e31c5a973f68ab50249c00c
tree9d475d1a34c281d154db39410131a120bf685672
parent759f03ac843b324a8b9a4e0275b17f811ff1e1ee
parent1392643048f1fa6a8b3ecebd41203c76aea25f91
Merge branch 'pull-request/817'

* pull-request/817:
  Correct two zlib tests to use a string, not a const