From: Xinchen Hui <laruence@php.net>
Date: Sun, 21 Apr 2013 03:09:18 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta4~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b1928ba0bad1b5ad8cb1f9f3b34126af714f700;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

6b1928ba0bad1b5ad8cb1f9f3b34126af714f700