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

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

15979d2c9e029089b06c48570e8cf0faa0a20dc7