From: Xinchen Hui <laruence@php.net>
Date: Tue, 11 Nov 2014 08:23:18 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1~55^2~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e003c56c7463b9b5076d97724a06f6932d605a09;p=php

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

e003c56c7463b9b5076d97724a06f6932d605a09