From: Xinchen Hui <laruence@php.net>
Date: Thu, 14 Aug 2014 03:52:46 +0000 (+0800)
Subject: Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bfc1ae07bec3bda6dc0522da50b35ba093d4247c;p=php

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

bfc1ae07bec3bda6dc0522da50b35ba093d4247c