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

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

e8e5913e5e3500d2efee4a60fdfd77ab46fe2021