From: Xinchen Hui <laruence@php.net>
Date: Sun, 6 May 2012 12:32:33 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~232^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ad35d6c77bb1ac1c98a92f98cb11d2966d80b7b;p=php

Merge branch 'PHP-5.4'
---

5ad35d6c77bb1ac1c98a92f98cb11d2966d80b7b