From: Xinchen Hui <laruence@php.net>
Date: Fri, 17 Jul 2015 07:56:28 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.0.0beta2~6^2~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91e5b30a3b37bdddc87fb5cddde6e4dd5de3fa78;p=php

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

91e5b30a3b37bdddc87fb5cddde6e4dd5de3fa78