From: Stanislav Malyshev <stas@php.net>
Date: Tue, 29 Jan 2013 20:12:58 +0000 (-0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~580
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=861c16d6564bf73b0ab714706980476067944cce;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  complete zts fix
---

861c16d6564bf73b0ab714706980476067944cce