From: Xinchen Hui <laruence@php.net>
Date: Sat, 16 Feb 2013 14:29:14 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha5~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69b80a93defc23ac3bc9b7e58c04628cc2765f7e;p=php

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

69b80a93defc23ac3bc9b7e58c04628cc2765f7e