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

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

a0a4eb23ee9631e52bd604540a55ba8e66825488