From: Remi Collet <remi@php.net>
Date: Tue, 10 Jun 2014 08:38:39 +0000 (+0200)
Subject: fix merge from php 5.5 (already fixed, differently)
X-Git-Tag: PRE_PHPNG_MERGE~213^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2493a3a084102db5119cd3402eda0352d88017f;p=php

fix merge from php 5.5 (already fixed, differently)
---

e2493a3a084102db5119cd3402eda0352d88017f