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

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

bcb4fcd305962b6b382d97e435b474c4c74d24aa