From: Xinchen Hui <laruence@php.net>
Date: Fri, 10 Apr 2015 14:48:36 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.9RC1~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa0608077bc9f671262416442e25620be7114c31;p=php

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

fa0608077bc9f671262416442e25620be7114c31