From: Xinchen Hui <laruence@php.net>
Date: Thu, 13 Dec 2012 02:45:33 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha2~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d2593e1beefc41632dc775a3c98603b46751442;p=php

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

4d2593e1beefc41632dc775a3c98603b46751442