From: Xinchen Hui <laruence@php.net>
Date: Wed, 5 Sep 2012 15:48:54 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~24^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12191a9f361a74ebcbeecffee51465086fc48cfc;p=php

Merge branch 'PHP-5.4'
---

12191a9f361a74ebcbeecffee51465086fc48cfc