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

Merge branch 'PHP-5.5' into PHP-5.6

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

b120f9beb2a0d07c8c16d9e6cc5b1226bb863d31