From: Xinchen Hui <laruence@php.net>
Date: Mon, 9 Feb 2015 03:32:32 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHP7_REMOVALS~13^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d1ec33f96de25abdcc5bb239e86e98ac278f955;p=php

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

3d1ec33f96de25abdcc5bb239e86e98ac278f955