From: Xinchen Hui <laruence@php.net>
Date: Sat, 26 Jul 2014 02:46:12 +0000 (+0800)
Subject: Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55cc812fc749887617b1c3534fd4c12ddc2b7a6e;p=php

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

55cc812fc749887617b1c3534fd4c12ddc2b7a6e