From: Anatol Belski <ab@php.net>
Date: Wed, 22 Jan 2014 11:05:06 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~388^2~23^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca27c86110e40f7a38baa196c20a0a3997ffefe8;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix zts
---

ca27c86110e40f7a38baa196c20a0a3997ffefe8