From: Xinchen Hui <laruence@php.net>
Date: Mon, 15 Jun 2015 05:37:14 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.0.0alpha2~2^2~138
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a324dae81ff725edea59bf6d17c9208b52f98f2;p=php

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

8a324dae81ff725edea59bf6d17c9208b52f98f2