From: Xinchen Hui <laruence@php.net>
Date: Fri, 5 Jun 2015 03:54:53 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.0.0alpha1~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d251ced225138381b61dfa5c5f682bbb28e309d9;p=php

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

d251ced225138381b61dfa5c5f682bbb28e309d9