From: Xinchen Hui <laruence@php.net>
Date: Wed, 23 Jul 2014 03:05:29 +0000 (+0800)
Subject: Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b2988086048562e4118defa78fea0b9c9731506;p=php

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

6b2988086048562e4118defa78fea0b9c9731506