From: Xinchen Hui <laruence@php.net>
Date: Sun, 17 Feb 2013 03:06:33 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha5~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d3291de51a169b2141460ff2e432774fe84cc90e;p=php

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

d3291de51a169b2141460ff2e432774fe84cc90e