From: Xinchen Hui <laruence@php.net>
Date: Thu, 5 Mar 2015 10:40:06 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.7RC1~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=168be6f250bbbef39ffb0b4cef63f2a75e4aeffd;p=php

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

168be6f250bbbef39ffb0b4cef63f2a75e4aeffd