From: Xinchen Hui <laruence@php.net>
Date: Wed, 7 May 2014 08:53:20 +0000 (+0800)
Subject: Merge branch 'phpng' of git.php.net:php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~384^2~26^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea26b820e106ccad42844aeef8ef42d3311e2cbf;p=php

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

ea26b820e106ccad42844aeef8ef42d3311e2cbf