From: Xinchen Hui <laruence@php.net>
Date: Sat, 28 Jul 2012 09:01:50 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~145
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=328541db6d7eb974cf1d2126d46bfe44ec5afa0d;p=php

Merge branch 'PHP-5.4'
---

328541db6d7eb974cf1d2126d46bfe44ec5afa0d