From: Xinchen Hui <laruence@php.net>
Date: Sun, 3 Mar 2013 03:25:08 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
X-Git-Tag: php-5.5.0alpha6~6^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe5ce5cb9143ca251dd8c2083a63232d8beea5a9;p=php

Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
---

fe5ce5cb9143ca251dd8c2083a63232d8beea5a9