From: Xinchen Hui <laruence@php.net>
Date: Mon, 9 Feb 2015 03:43:37 +0000 (+0800)
Subject: Merge branch 'master' of https://github.com/NikV/php-src
X-Git-Tag: PRE_PHP7_REMOVALS~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0698901051c1356e054ac67ac065880b23f60f6f;p=php

Merge branch 'master' of https://github.com/NikV/php-src
---

0698901051c1356e054ac67ac065880b23f60f6f