From: Xinchen Hui <laruence@php.net>
Date: Tue, 1 Jul 2014 02:29:11 +0000 (+0800)
Subject: Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~98
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42bfa2382ce4461c34c1b1c169ae0ac7c68a5170;p=php

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

42bfa2382ce4461c34c1b1c169ae0ac7c68a5170