From: Xinchen Hui <laruence@php.net>
Date: Fri, 18 Oct 2013 02:34:36 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
X-Git-Tag: php-5.5.6RC1~5^2~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db61685edf76579868fdfda514534bf8f37ce602;p=php

Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
---

db61685edf76579868fdfda514534bf8f37ce602