From: Stanislav Malyshev <stas@php.net>
Date: Thu, 8 May 2014 09:04:50 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~295
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=281bde7701094b88fc0c3ebcba0d33a84b6ef5f5;p=php

Merge branch 'PHP-5.6'

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

281bde7701094b88fc0c3ebcba0d33a84b6ef5f5