From: Xinchen Hui <laruence@php.net>
Date: Tue, 10 Mar 2015 02:44:07 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~93
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6762192d20c1e0eb43174250aa050ea33e0f930;p=php

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

f6762192d20c1e0eb43174250aa050ea33e0f930