From: Xinchen Hui <laruence@php.net>
Date: Sat, 9 Mar 2013 03:38:58 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~484
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76fda41bb3e9d59f56003fbc68883eb3a9f4ba58;p=php

Merge branch 'PHP-5.5'
---

76fda41bb3e9d59f56003fbc68883eb3a9f4ba58