From: Xinchen Hui <laruence@php.net>
Date: Sun, 17 Feb 2013 03:07:07 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~536
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a1b5796c5c814e3ea47542f8a1ba093d840d5fe8;p=php

Merge branch 'PHP-5.5'
---

a1b5796c5c814e3ea47542f8a1ba093d840d5fe8