From: Xinchen Hui <laruence@php.net>
Date: Thu, 17 Oct 2013 04:25:01 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~211^2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a1a7522105c333aff3d8c6c61ec68a85c8dd9927;p=php

Merge branch 'PHP-5.5'
---

a1a7522105c333aff3d8c6c61ec68a85c8dd9927