From: Matteo Beccati <mbeccati@php.net>
Date: Sat, 6 Dec 2014 09:24:56 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_NATIVE_TLS_MERGE~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d76e16504137bc096667cc5e25a9238b7a3d8a6;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix compilation error (ref #68424)
---

0d76e16504137bc096667cc5e25a9238b7a3d8a6