From: Xinchen Hui <laruence@php.net>
Date: Fri, 16 May 2014 06:20:54 +0000 (+0800)
Subject: Merge branch 'phpng' of git.php.net:php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~341
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=417860f95d657384c466409d1efd6fa7287572b7;p=php

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

417860f95d657384c466409d1efd6fa7287572b7