From: Xinchen Hui <laruence@php.net>
Date: Thu, 17 Jul 2014 07:21:46 +0000 (+0800)
Subject: Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e378844abbfbc7fec88d063ee0bf2e9026b6b6a;p=php

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

4e378844abbfbc7fec88d063ee0bf2e9026b6b6a