From: Xinchen Hui <laruence@php.net>
Date: Mon, 17 Dec 2012 04:58:12 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea5132866f2889c0a3331244271fb96214bcfe8f;p=php

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

ea5132866f2889c0a3331244271fb96214bcfe8f