From: Xinchen Hui <laruence@php.net>
Date: Tue, 7 Jul 2015 13:40:46 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.0.0beta1~12^2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=015d20ab8398bb337cfddd2e0ec6a81cd270d82f;p=php

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

015d20ab8398bb337cfddd2e0ec6a81cd270d82f