From: Xinchen Hui <laruence@php.net>
Date: Mon, 29 Jun 2015 07:17:58 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.1.0alpha3~25^2~132
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5d38e0deabe0e5b2edcb0255fc921f6be489cbd;p=php

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

a5d38e0deabe0e5b2edcb0255fc921f6be489cbd