From: Xinchen Hui <laruence@php.net>
Date: Thu, 8 May 2014 09:03:26 +0000 (+0800)
Subject: Merge branch 'phpng' of git.php.net:php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~384^2~24^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7de633c5490cbe9845bf62f00036f5ec5674df84;p=php

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

7de633c5490cbe9845bf62f00036f5ec5674df84