From: Xinchen Hui <laruence@php.net>
Date: Tue, 27 Jan 2015 14:25:45 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.6RC1~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b881de9937d7433533554603826aa4b14e08d47c;p=php

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

b881de9937d7433533554603826aa4b14e08d47c