From: Xinchen Hui <laruence@php.net>
Date: Wed, 11 Mar 2015 00:20:03 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~85
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4f727d0f875a3480611ae793ac40b391e62644f;p=php

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

d4f727d0f875a3480611ae793ac40b391e62644f