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

fix merge
---

9a9add6b739da70ba4ed29f089c230566c2be002