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

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

28bc91d8b464b5fb5403cf16f7d265069be183e7