From: Felipe Pena <felipensp@gmail.com>
Date: Wed, 20 Nov 2013 13:31:00 +0000 (-0200)
Subject: - Fix conflict
X-Git-Tag: php-5.6.0alpha1~110^2~182
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de3b59415643ffb3460f16f786f67647627d5916;p=php

- Fix conflict
---

de3b59415643ffb3460f16f786f67647627d5916