From: Pierre Joye <pierre.php@gmail.com>
Date: Wed, 27 Feb 2013 15:00:11 +0000 (+0100)
Subject: - fix conflict on merge
X-Git-Tag: php-5.6.0alpha1~505
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ab9f906da13ac84bf3a62aeb65f099ed28eb946;p=php

- fix conflict on merge
---

6ab9f906da13ac84bf3a62aeb65f099ed28eb946