From: Xinchen Hui <laruence@php.net>
Date: Fri, 19 Jun 2015 01:57:48 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.0.0alpha2~2^2~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb4454b5133adec98f9b454018b9071da675527b;p=php

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

bb4454b5133adec98f9b454018b9071da675527b