From: Xinchen Hui <laruence@php.net>
Date: Wed, 14 Aug 2013 03:44:53 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~299
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6fa0b40f7e1f942febdc35513f310a5880c4eb0;p=php

Merge branch 'PHP-5.5'
---

b6fa0b40f7e1f942febdc35513f310a5880c4eb0