From: Xinchen Hui <laruence@php.net>
Date: Mon, 10 Nov 2014 05:47:14 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1~55^2~57^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b9e44888c0a50252a2f155f16b0f9646d5a5e96e;p=php

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

b9e44888c0a50252a2f155f16b0f9646d5a5e96e