From: Remi Collet <remi@php.net>
Date: Tue, 4 Mar 2014 12:46:21 +0000 (+0100)
Subject: fix merge
X-Git-Tag: php-5.6.0beta1~3^2~147
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=834b719cf5808351904734bab5f97f2e88d8176e;p=php

fix merge
---

834b719cf5808351904734bab5f97f2e88d8176e