From: Xinchen Hui <laruence@php.net>
Date: Wed, 18 Jul 2012 10:00:58 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e325d612637605b8fada38b665f5bf49ab55b5a;p=php

Merge branch 'PHP-5.4'
---

2e325d612637605b8fada38b665f5bf49ab55b5a