From: Xinchen Hui <laruence@php.net>
Date: Thu, 28 Aug 2014 09:04:04 +0000 (+0800)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: PRE_PHP7_REMOVALS~234
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31d6f15b540a264c1ef645e28f2ccdc475787c77;p=php

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

31d6f15b540a264c1ef645e28f2ccdc475787c77