From: Xinchen Hui <laruence@php.net>
Date: Tue, 14 Aug 2012 16:16:05 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d3ad2d72ba9bfb58780d4da235926ae76bdf2b7e;p=php

Merge branch 'PHP-5.4'
---

d3ad2d72ba9bfb58780d4da235926ae76bdf2b7e