From: Xinchen Hui <laruence@php.net>
Date: Wed, 15 Apr 2015 02:39:17 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.9RC1~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=caf4beab2d6700f0c655cef4d1909832b83df741;p=php

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

caf4beab2d6700f0c655cef4d1909832b83df741