From: Stanislav Malyshev <stas@php.net>
Date: Thu, 8 May 2014 09:00:23 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.13RC1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf2b9955d4c26393f6d16b71b5c2c69d8d2b7f52;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  oops, 5.4 and 5.5 use malloc in TSRM
---

cf2b9955d4c26393f6d16b71b5c2c69d8d2b7f52