From: Xinchen Hui <laruence@php.net>
Date: Fri, 27 Jul 2012 16:55:02 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~146
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef23da27e056c1efda4a254bc64ff51e38a84836;p=php

Merge branch 'PHP-5.4'
---

ef23da27e056c1efda4a254bc64ff51e38a84836