From: Xinchen Hui <laruence@php.net>
Date: Mon, 12 May 2014 07:55:48 +0000 (+0800)
Subject: Merge branch 'phpng' of git.php.net:php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~380^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1be957ebc9f86431abcad43e7c3f1e9b8b8c4dc8;p=php

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

1be957ebc9f86431abcad43e7c3f1e9b8b8c4dc8