From: Anatol Belski <ab@php.net>
Date: Thu, 14 Mar 2013 13:39:47 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta1~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96388c78c978101a84dc2ccc8b02948f0fb5999f;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix zts check
---

96388c78c978101a84dc2ccc8b02948f0fb5999f