From: Xinchen Hui <laruence@php.net>
Date: Tue, 24 Jul 2012 06:46:25 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~157
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd9d64b21e4bbc8a106a6156dc6ffefbcc33ec02;p=php

Merge branch 'PHP-5.4'
---

dd9d64b21e4bbc8a106a6156dc6ffefbcc33ec02