From: Xinchen Hui <laruence@php.net>
Date: Sat, 17 May 2014 02:39:05 +0000 (+0800)
Subject: Merge branch 'phpng' of git.php.net:php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~330
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84eeae80d85be7556c09106c227605f804a4ee9e;p=php

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

84eeae80d85be7556c09106c227605f804a4ee9e