From: Pierre Joye <pierre.php@gmail.com>
Date: Tue, 7 Jun 2016 10:39:22 +0000 (+0700)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.1.0alpha1~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2edbb3e11546922fa123bbd2f40630576c8bd15f;p=php

Merge branch 'master' of git.php.net:php-src
---

2edbb3e11546922fa123bbd2f40630576c8bd15f