From: Xinchen Hui <laruence@php.net>
Date: Tue, 27 May 2014 09:48:47 +0000 (+0800)
Subject: Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~272
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c9f6caf39a0f07b37a3cca033c36de0b7745e6c;p=php

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

4c9f6caf39a0f07b37a3cca033c36de0b7745e6c