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

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

8b90b17c8d7cc3def0d81256a021a7e86a2401a1