From: Xinchen Hui <laruence@php.net>
Date: Sat, 13 Jun 2015 02:51:15 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.0.0alpha2~2^2~157
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=829c7a1bb0888632a64eb71077192f5e89badbd9;p=php

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

829c7a1bb0888632a64eb71077192f5e89badbd9