From: Xinchen Hui <laruence@php.net>
Date: Tue, 10 Mar 2015 09:06:05 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5589d3fb46bd3f8705153657df6d86a6145f4ad;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

b5589d3fb46bd3f8705153657df6d86a6145f4ad