From: Xinchen Hui <laruence@php.net>
Date: Mon, 9 Mar 2015 09:23:04 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~95
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ca14f681e2eebbbb232b7a3f662ed05038d779f;p=php

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

4ca14f681e2eebbbb232b7a3f662ed05038d779f