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

Merge branch 'PHP-5.5'
---

0fbe0a14950561f9e27a00a0c007505982c02d0b