From: Pierre Joye <pierre.php@gmail.com>
Date: Tue, 19 Jul 2016 11:55:09 +0000 (+0700)
Subject: merge conflict
X-Git-Tag: php-7.1.0beta1~25^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2767d1953fe1967bb406358e42b3e560eb7b1045;p=php

merge conflict
---

2767d1953fe1967bb406358e42b3e560eb7b1045