From: Xinchen Hui <laruence@php.net>
Date: Wed, 9 Jan 2013 02:57:47 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha3~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6deb8361f32d14fffdd284b47b59cd5dd50baf80;p=php

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

6deb8361f32d14fffdd284b47b59cd5dd50baf80