From: Xinchen Hui <laruence@php.net>
Date: Sun, 29 Jul 2012 06:31:22 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~141
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c73c8d58d9948e6a38f8053c4a6da1dcbd2ac94;p=php

Merge branch 'PHP-5.4'
---

9c73c8d58d9948e6a38f8053c4a6da1dcbd2ac94