From: Xinchen Hui <laruence@php.net>
Date: Mon, 19 May 2014 02:21:13 +0000 (+0800)
Subject: Merge branch 'phpng' of git.php.net:php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~328
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3eeb0dc9f74a0267dfed3b62caffe1c98bea9106;p=php

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

3eeb0dc9f74a0267dfed3b62caffe1c98bea9106