From: Xinchen Hui <laruence@php.net>
Date: Thu, 2 Apr 2015 01:06:38 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
X-Git-Tag: php-5.5.25RC1~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3645a80b381cedf80b1503565265bc09d45fbde6;p=php

Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
---

3645a80b381cedf80b1503565265bc09d45fbde6