From: Anatol Belski <ab@php.net>
Date: Thu, 14 Mar 2013 13:40:03 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~471
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=657135c16adc90df448aa7832356ab2f6f70cb7a;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  fix zts check
---

657135c16adc90df448aa7832356ab2f6f70cb7a