From: Xinchen Hui <laruence@php.net>
Date: Thu, 13 Aug 2015 05:30:50 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.0.0RC1~7^2~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=793d8dcffd52d0e9224d96ef6c9573c4ec7492c8;p=php

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

793d8dcffd52d0e9224d96ef6c9573c4ec7492c8