From: Xinchen Hui <laruence@php.net>
Date: Fri, 6 Feb 2015 14:43:11 +0000 (+0800)
Subject: Merge branch 'master' of https://github.com/mabes/php-src
X-Git-Tag: PRE_PHP7_REMOVALS~12^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2bdf8d30b4fcb4e8e7fe1f1b468132b3513c52c0;p=php

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

2bdf8d30b4fcb4e8e7fe1f1b468132b3513c52c0