From: Stanislav Malyshev <stas@php.net>
Date: Mon, 1 Dec 2014 02:26:39 +0000 (-0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_NATIVE_TLS_MERGE~105^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de65eaa8c8faf6ae256aef3a2a074255b249a6f0;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixes memory leak introduced in 2b9af967
---

de65eaa8c8faf6ae256aef3a2a074255b249a6f0