From: Xinchen Hui <laruence@php.net>
Date: Sun, 6 Jan 2013 02:20:10 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
X-Git-Tag: php-5.5.0alpha3~14^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3a699e090d3016d98c3896829258ae66693b56a;p=php

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

a3a699e090d3016d98c3896829258ae66693b56a