From: Remi Collet <remi@php.net>
Date: Wed, 13 Nov 2013 12:21:12 +0000 (+0100)
Subject: fix merge
X-Git-Tag: php-5.6.0alpha1~197
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74ab30e216bcfc52dc88a46a378d5e9980208a6b;p=php

fix merge
---

74ab30e216bcfc52dc88a46a378d5e9980208a6b