From: Xinchen Hui <laruence@php.net>
Date: Wed, 25 Mar 2015 05:54:30 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ab1513ac98ab3a40faa9c15a10611b8ac2389f3;p=php

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

3ab1513ac98ab3a40faa9c15a10611b8ac2389f3