From: Xinchen Hui <laruence@php.net>
Date: Tue, 5 Mar 2013 06:03:47 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~496
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac2376fbf13469498b3cf66e6a9eec2234ea6af1;p=php

Merge branch 'PHP-5.5'
---

ac2376fbf13469498b3cf66e6a9eec2234ea6af1