From: Xinchen Hui <laruence@php.net>
Date: Thu, 31 Jul 2014 04:57:37 +0000 (+0800)
Subject: Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~41^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf5b3ed31c00040a2e0f1d5142ace3576b758c30;p=php

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

cf5b3ed31c00040a2e0f1d5142ace3576b758c30