From: Xinchen Hui <laruence@php.net>
Date: Sat, 14 Mar 2015 03:31:53 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96bb3b838c5cbeafa1328c65fbe33be1c340572b;p=php

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

96bb3b838c5cbeafa1328c65fbe33be1c340572b