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

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

e6338f5a6231c3a79cf26f057df66f96ea83ae80