From: Stanislav Malyshev <stas@php.net>
Date: Mon, 24 Nov 2014 01:13:03 +0000 (-0800)
Subject: Merge branch 'pull-request/817'
X-Git-Tag: PRE_NATIVE_TLS_MERGE~150^2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bf0c12abfba2ccf7e31c5a973f68ab50249c00c;p=php

Merge branch 'pull-request/817'

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

0bf0c12abfba2ccf7e31c5a973f68ab50249c00c